Merge branch 'staging' into release

8 files changed, 151 insertions, 53 deletions

diff --git a/indoteknik_api/controllers/api_v1/__init__.py b/indoteknik_api/controllers/api_v1/__init__.py
index 682cb369..5d5f723b 100644
--- a/indoteknik_api/controllers/api_v1/__init__.py
+++ b/indoteknik_api/controllers/api_v1/__init__.py
@@ -7,6 +7,7 @@ from . import district
 from . import download
 from . import flash_sale
 from . import invoice
+from . import lead
 from . import manufacture
 from . import page_content
 from . import partner
diff --git a/indoteknik_api/controllers/api_v1/flash_sale.py b/indoteknik_api/controllers/api_v1/flash_sale.py
index cad2cb61..a0aaa44e 100644
--- a/indoteknik_api/controllers/api_v1/flash_sale.py
+++ b/indoteknik_api/controllers/api_v1/flash_sale.py
@@ -10,7 +10,7 @@ _logger = logging.getLogger(__name__)
 class FlashSale(controller.Controller):
     prefix = '/api/v1/'
     
-    @http.route(prefix + 'flashsale/header', auth='public', methods=['GET'])
+    @http.route(prefix + 'flashsale/header', auth='public', methods=['GET', 'OPTIONS'])
     @controller.Controller.must_authorized()
     def _get_flash_sale_header(self, **kw):
         try:
diff --git a/indoteknik_api/controllers/api_v1/lead.py b/indoteknik_api/controllers/api_v1/lead.py
new file mode 100644
index 00000000..df4f46bd
--- /dev/null
+++ b/indoteknik_api/controllers/api_v1/lead.py
@@ -0,0 +1,26 @@
+from .. import controller
+from odoo import http
+from odoo.http import request
+
+class Lead(controller.Controller):
+    @http.route('/api/v1/lead', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
+    @controller.Controller.must_authorized()
+    def create_lead(self, **kw):
+        params = self.get_request_params(kw, {
+            "name": ["required"],
+            "contact_name": [],
+            "email_from": [],
+            "phone": [],
+            "file_npwp": [],
+            "file_nib": [],
+            "file_tdp": [],
+            "file_siup": [],
+            "description": []
+        })
+
+        if not params['valid']:
+            return self.response(code=400, description=params)
+        
+        lead = request.env['crm.lead'].create(params['value'])
+
+        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 76fbfddb..425dd296 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -53,6 +53,7 @@ class SaleOrder(controller.Controller):
             'name': [],
             'limit': ['default:0', 'number'],
             'offset': ['default:0', 'number'],
+            'context': []
         })
         limit = params['value']['limit']
         offset = params['value']['offset']
@@ -61,6 +62,13 @@ class SaleOrder(controller.Controller):
 
         partner_child_ids = self.get_partner_child_ids(params['value']['partner_id'])
         domain = [('partner_id', 'in', partner_child_ids)]
+
+        context = params['value']['context']
+        if context == 'quotation':
+            domain += [('approval_status', '=', False)]
+        if not context:
+            domain += [('approval_status', '!=', False)]
+
         if params['value']['name']:
             name = params['value']['name'].replace(' ', '%')
             domain += [
@@ -213,8 +221,11 @@ class SaleOrder(controller.Controller):
     @http.route(PREFIX_PARTNER + 'sale_order/checkout', auth='public', method=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized(private=True, private_key='partner_id')
     def create_partner_sale_order(self, **kw):
-        product_pricelist_default_discount_id = request.env['ir.config_parameter'].get_param('product.pricelist.default_discount_id')
-        product_pricelist_default_discount_id = int(product_pricelist_default_discount_id)
+        config = request.env['ir.config_parameter']
+        product_pricelist_default_discount_id = int(config.get_param('product.pricelist.default_discount_id'))
+        product_pricelist_tier1 = int(config.get_param('product.pricelist.tier1'))
+        product_pricelist_tier2 = int(config.get_param('product.pricelist.tier2'))
+        product_pricelist_tier3 = int(config.get_param('product.pricelist.tier3'))
 
         params = self.get_request_params(kw, {
             'partner_id': ['number'],
@@ -232,7 +243,7 @@ class SaleOrder(controller.Controller):
         parameters = {
             'warehouse_id': 8,
             'carrier_id': 1,
-            'sales_tax_id': 23,
+            'sales_tax_id': 21,
             'pricelist_id': product_pricelist_default_discount_id,
             'payment_term_id': 26,
             'team_id': 2,
@@ -252,15 +263,36 @@ class SaleOrder(controller.Controller):
         sale_order = request.env['sale.order'].create([parameters])
         order_line = json.loads(params['value']['order_line'])
         parameters = []
+
+        partner = request.env['res.partner'].browse(params['value']['partner_id']) 
+        partner_pricelist = partner.property_product_pricelist
         for line in order_line:
             product = request.env['product.product'].search([('id', '=', line['product_id'])], limit=1)
+            discount = product._get_website_disc(0)
+
+            price_tier = False
+            pricelist = {
+                'tier1': product._get_pricelist_tier1,
+                'tier2': product._get_pricelist_tier2,
+                'tier3': product._get_pricelist_tier3,
+            }
+            partner_pricelist_id = partner_pricelist.id if partner_pricelist else False
+            if partner_pricelist_id == product_pricelist_tier1: price_tier = 'tier1'
+            if partner_pricelist_id == product_pricelist_tier2: price_tier = 'tier2'
+            if partner_pricelist_id == product_pricelist_tier3: price_tier = 'tier3'
+
+            if price_tier:
+                price = pricelist[price_tier]()
+                discount_key = 'discount_%s' % price_tier
+                if price[discount_key] > 0: discount = price[discount_key]
+
             parameters.append({
                 'company_id': 1,
                 'order_id': sale_order.id,
                 'product_id': line['product_id'],
                 'product_uom_qty': line['quantity'],
-                'price_subtotal': product._get_website_price_exclude_tax(),
-                'discount': product._get_website_disc(0)
+                'price_unit': product._get_website_price_exclude_tax(),
+                'discount': discount
             })
         request.env['sale.order.line'].create(parameters)
         return self.response({
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index 1f1f2413..5edb208e 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -118,6 +118,60 @@ class User(controller.Controller):
             'user': request.env['res.users'].api_single_response(user)
         })
     
+    @http.route(prefix + 'user/activation', auth='public', methods=['POST'], csrf=False)
+    @controller.Controller.must_authorized()
+    def activation_user(self, **kw):
+        token = kw.get('token')
+        if not token:
+            return self.response(code=400, description='token is required')
+        
+        user = request.env['res.users'].search([('activation_token', '=', token), ('active', '=', False)], limit=1)
+        if not user:
+            return self.response({'activation': False, 'reason': 'INVALID_TOKEN'})
+        
+        user.active = True
+        user.activation_token = ''
+        return self.response({
+            'activation': True,
+            'user': self.response_with_token(user)
+        })
+    
+    @http.route(prefix + 'user/forgot-password', auth='public', methods=['POST'], csrf=False)
+    @controller.Controller.must_authorized()
+    def forgot_password_user(self, **kw):
+        email = kw.get('email')
+        user = self.get_user_by_email(email)
+        if not user:
+            return self.response({'success': False, 'reason': 'NOT_FOUND'})
+
+        token_source = string.ascii_letters + string.digits
+        user.reset_password_token = ''.join(random.choice(token_source) for i in range(21))
+        return self.response({
+            'success': True,
+            'token': user.reset_password_token,
+            'user': request.env['res.users'].api_single_response(user)
+        })
+    
+    @http.route(prefix + 'user/reset-password', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
+    @controller.Controller.must_authorized()
+    def reset_password_user(self, **kw):
+        token = kw.get('token')
+        if not token:
+            return self.response(code=400, description='token is required')
+        
+        user = request.env['res.users'].search([('reset_password_token', '=', token), ('active', 'in', [False, True])], limit=1)
+        
+        if not user:
+            return self.response({'success': False, 'reason': 'INVALID_TOKEN'})
+        
+        password = kw.get('password', '')
+        user.password = password
+        user.reset_password_token = ''
+        return self.response({
+            'success': True,
+            'user': request.env['res.users'].api_single_response(user)
+        })
+    
     @http.route(prefix + 'user/<id>', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def update_user(self, **kw):
@@ -151,21 +205,4 @@ class User(controller.Controller):
         address = [request.env['res.users'].api_address_response(x) for x in partners]
         
         return self.response(address)
-    
-    @http.route(prefix + 'user/activation', auth='public', methods=['POST'], csrf=False)
-    @controller.Controller.must_authorized()
-    def activation_user(self, **kw):
-        token = kw.get('token')
-        if not token:
-            return self.response(code=400, description='token is required')
-        
-        user = request.env['res.users'].search([('activation_token', '=', token), ('active', '=', False)], limit=1)
-        if not user:
-            return self.response({'activation': False, 'reason': 'INVALID_TOKEN'})
-        
-        user.active = True
-        user.activation_token = ''
-        return self.response({
-            'activation': True,
-            'user': self.response_with_token(user)
-        })
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v2/product.py b/indoteknik_api/controllers/api_v2/product.py
index 772906f6..d9b43bda 100644
--- a/indoteknik_api/controllers/api_v2/product.py
+++ b/indoteknik_api/controllers/api_v2/product.py
@@ -5,17 +5,19 @@ from odoo.http import request
 class V2Product(controller.Controller):
     prefix = '/api/v2/'
 
-    @http.route(prefix + 'product/<id>', auth='public', methods=['GET'])
+    @http.route(prefix + 'product/<id>', auth='public', methods=['GET', 'OPTIONS'])
     @controller.Controller.must_authorized()
     def v2_get_product_by_id(self, **kw):
         id = kw.get('id')
         if not id:
             return self.response(code=400, description='id is required')
+        
+        pricelist = self.user_pricelist()
 
         data = []
         id = [int(x) for x in id.split(',')]
         product_templates = request.env['product.template'].search([('id', 'in', id)])
         if product_templates:
-            data = [request.env['product.template'].v2_api_single_response(x, with_detail='DEFAULT') for x in product_templates]
+            data = [request.env['product.template'].v2_api_single_response(x, pricelist=pricelist, with_detail='DEFAULT') for x in product_templates]
         
         return self.response(data)
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v2/product_variant.py b/indoteknik_api/controllers/api_v2/product_variant.py
index b74e4936..8a5bbeb1 100644
--- a/indoteknik_api/controllers/api_v2/product_variant.py
+++ b/indoteknik_api/controllers/api_v2/product_variant.py
@@ -12,11 +12,13 @@ class V2ProductVariant(controller.Controller):
         if not id:
             return self.response(code=400, description='id is required')
         
+        pricelist = self.user_pricelist()
+        
         data = []
         id = [int(x) for x in id.split(',')]
         product_products = request.env['product.product'].search([('id', 'in', id)])
         if product_products:
-            data = [request.env['product.product'].v2_api_single_response(x) for x in product_products]
+            data = [request.env['product.product'].v2_api_single_response(x, pricelist=pricelist) for x in product_products]
         
         return self.response(data)
         
diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py
index f419f66e..5b20f7d4 100644
--- a/indoteknik_api/controllers/controller.py
+++ b/indoteknik_api/controllers/controller.py
@@ -54,7 +54,15 @@ class Controller(http.Controller):
             if user_token:
                 result = user_token
             return result
-    
+        
+    def user_pricelist(self):
+        user_token = self.authenticate()
+        pricelist = False
+        if isinstance(user_token, dict):
+            partner = request.env['res.partner'].browse(user_token['partner_id'])
+            if partner: pricelist = partner.property_product_pricelist
+        return pricelist
+
     def get_request_params(self, kw, queries):
         result = {
             'valid': True,
@@ -62,40 +70,30 @@ class Controller(http.Controller):
             'value': {},
             'query': {}
         }
-        for key in queries:
-            rules = queries[key]
-            is_number = len([r for r in rules if r == 'number']) > 0
-
-            has_alias = [r for r in rules if r.startswith('alias:')]
-            alias = key
-            if len(has_alias) > 0:
-                alias = has_alias[0].replace('alias:', '')
-
-            has_default = [r for r in rules if r.startswith('default:')]
-            default = None
-            if len(has_default) > 0:
-                default = has_default[0].replace('default:', '')
-
-            value = kw.get(key, '')
-            if value in ['null', 'undefined']:
+    
+        for key, rules in queries.items():
+            is_number = 'number' in rules
+            alias = next((r.replace('alias:', '') for r in rules if r.startswith('alias:')), key)
+            default = next((r.replace('default:', '') for r in rules if r.startswith('default:')), None)
+
+            if (value := kw.get(key, '')) in ['null', 'undefined']:
                 value = ''
-            for rule in rules:
-                if rule == 'required' and not value:
-                    result['reason'].append(key + ' is ' + rule)
-                elif rule == 'number' and value and not value.isdigit():
-                    result['reason'].append(key + ' must be ' + rule)
+            if 'required' in rules and not value:
+                result['reason'].append(f"{key} is required")
+            if 'number' in rules and value and not value.isdigit():
+                result['reason'].append(f"{key} must be a number")
 
             result['query'][key] = value
+
             if not value and default:
                 value = default
             if is_number and value.isdigit():
                 value = int(value)
-            if not value and not default:
-                value = None
+
             result['value'][alias] = value
 
-            if len(result['reason']) > 0:
-                result['valid'] = False
+        result['valid'] = not result['reason']
+        
         return result
 
     def time_to_str(self, object, format):