Merge remote-tracking branch 'origin/staging' into real-stock

3 files changed, 22 insertions, 0 deletions

diff --git a/indoteknik_api/controllers/api_v1/__init__.py b/indoteknik_api/controllers/api_v1/__init__.py
index d05cdf3a..2afefb34 100644
--- a/indoteknik_api/controllers/api_v1/__init__.py
+++ b/indoteknik_api/controllers/api_v1/__init__.py
@@ -1,3 +1,4 @@
+from . import activity
 from . import banner
 from . import blog
 from . import cart
diff --git a/indoteknik_api/controllers/api_v1/activity.py b/indoteknik_api/controllers/api_v1/activity.py
new file mode 100644
index 00000000..142db845
--- /dev/null
+++ b/indoteknik_api/controllers/api_v1/activity.py
@@ -0,0 +1,18 @@
+from .. import controller
+from odoo import http
+from odoo.http import request
+
+
+class Activity(controller.Controller):
+    @http.route('/api/v1/activity', auth='public', csrf=False, methods=['POST', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def create_user_activity(self, **kw):
+        user_data = self.verify_user_token()
+        user_id = user_data['user_id'] if user_data else False
+        request.env['user.activity.log'].create({
+            'page_title': kw.get('page_title', ''),
+            'url': kw.get('url', ''),
+            'res_user_id': user_id,
+            '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..aa211b75 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)
@@ -265,6 +266,8 @@ class SaleOrder(controller.Controller):
             'shipping_paid_by': 'customer',
             'carrier_id': params['value']['carrier_id'],
             'delivery_service_type': params['value']['delivery_service_type'],
+            'customer_type': 'nonpkp',
+            'npwp': '0'
         }
         if params['value']['type'] == 'sale_order':
             parameters['approval_status'] = 'pengajuan1'