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

5 files changed, 34 insertions, 3 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'
diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py
index 90bc50ed..0fcf4814 100644
--- a/indoteknik_api/controllers/controller.py
+++ b/indoteknik_api/controllers/controller.py
@@ -108,7 +108,6 @@ class Controller(http.Controller):
         return time
 
     def response(self, data=[], code=200, description='OK', headers=[]):
-        request.env['user.activity.log'].record_activity()
         response = {
             'status': {
                 'code': code,
@@ -169,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)
diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index 14fe68cb..edf95a58 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -10,6 +10,8 @@ class ProductProduct(models.Model):
         product_pricelist_default_discount_id = self.env['ir.config_parameter'].get_param('product.pricelist.default_discount_id')
         product_pricelist_default_discount_id = int(product_pricelist_default_discount_id)
         product_template = product_product.product_tmpl_id
+        stock = product_product.qty_stock_vendor
+        stock = stock if stock > 0 else 1
         data = {
             'id': product_product.id,
             'parent': {
@@ -20,7 +22,7 @@ class ProductProduct(models.Model):
             'code': product_product.default_code or '',
             'name': product_product.display_name,
             'price': self.env['product.pricelist'].compute_price(product_pricelist_default_discount_id, product_product.id),
-            'stock': product_product.qty_stock_vendor,
+            'stock': stock,
             'weight': product_product.weight,
             'attributes': [x.name for x in product_product.product_template_attribute_value_ids],
             'manufacture' : self.api_manufacture(product_product)
@@ -61,6 +63,8 @@ class ProductProduct(models.Model):
             price_discount = flashsale_price
             discount_percentage = flashsale_discount
 
+        stock = product_product.qty_stock_vendor
+        stock = stock if stock > 0 else 1
         product_template = product_product.product_tmpl_id
         data = {
             'id': product_product.id,
@@ -76,7 +80,7 @@ class ProductProduct(models.Model):
                 'discount_percentage': discount_percentage,
                 'price_discount': price_discount
             },
-            'stock': product_product.qty_stock_vendor,
+            'stock': stock,
             'weight': product_product.weight,
             'attributes': [x.name for x in product_product.product_template_attribute_value_ids],
             'manufacture' : self.api_manufacture(product_product)