Merge branch 'staging' into release

2 files changed, 7 insertions, 3 deletions

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)