diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-07-03 09:02:07 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-07-03 09:02:07 +0700 |
| commit | b7b7d0a4b88971ea4aaec1fce186c223d13ae0c4 (patch) | |
| tree | c1098299eef0c0ec7747adaf97be29dfd780ddae /indoteknik_api | |
| parent | 7df14abdd24cfaf92d92f155a51c0111e9425620 (diff) | |
| parent | 53b7bd51793802ebaa5e1bb9b8d525547158fe8b (diff) | |
Merge branch 'release' into aiway-bill
# Conflicts:
# indoteknik_custom/models/__init__.py
Diffstat (limited to 'indoteknik_api')
| -rw-r--r-- | indoteknik_api/controllers/api_v1/activity.py | 2 | ||||
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 1 | ||||
| -rw-r--r-- | indoteknik_api/controllers/controller.py | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indoteknik_api/controllers/api_v1/activity.py b/indoteknik_api/controllers/api_v1/activity.py index dfc0951c..142db845 100644 --- a/indoteknik_api/controllers/api_v1/activity.py +++ b/indoteknik_api/controllers/api_v1/activity.py @@ -13,6 +13,6 @@ class Activity(controller.Controller): 'page_title': kw.get('page_title', ''), 'url': kw.get('url', ''), 'res_user_id': user_id, - 'ip_address': kw.get('url', '') + 'ip_address': kw.get('ip_address', '') }) return self.response(True)
\ No newline at end of file diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 671ff5a8..c1665b72 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -153,6 +153,7 @@ class SaleOrder(controller.Controller): sale_order = request.env['sale.order'].search(domain) if sale_order: sale_order.partner_purchase_order_name = params['value']['name'] + sale_order.client_order_ref = params['value']['name'] sale_order.partner_purchase_order_file = params['value']['file'] data = sale_order.id return self.response(data) diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py index 826f45b4..0fcf4814 100644 --- a/indoteknik_api/controllers/controller.py +++ b/indoteknik_api/controllers/controller.py @@ -168,6 +168,12 @@ class Controller(http.Controller): def get_api_token(self, **kw): return self.response(request.env['ir.config_parameter'].sudo().get_param('rest_api_token') or '') + @http.route('/api/ip-address', auth='public', methods=['GET', 'OPTIONS']) + def get_ip_address(self): + address = request.httprequest.remote_addr + address = address if address != '127.0.0.1' else False + return self.response(address) + @http.route('/api/image/<model>/<field>/<id>', auth='public', methods=['GET']) def get_image(self, model, field, id): model = request.env[model].sudo().search([('id', '=', id)], limit=1) |