Merged in feature/voucher-cart (pull request #70)

Feature/voucher cart

3 files changed, 34 insertions, 12 deletions

diff --git a/indoteknik_api/controllers/api_v1/cart.py b/indoteknik_api/controllers/api_v1/cart.py
index d712be4d..5a60fd42 100644
--- a/indoteknik_api/controllers/api_v1/cart.py
+++ b/indoteknik_api/controllers/api_v1/cart.py
@@ -33,6 +33,7 @@ class Cart(controller.Controller):
     @http.route(PREFIX_USER + 'cart/create-or-update', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def create_or_update_cart(self, user_id, **kw):
+        # Convert input values to appropriate types
         user_id = int(user_id)
         product_id = int(kw.get('product_id', 0))
         qty = int(kw.get('qty', 0))
@@ -43,25 +44,36 @@ class Cart(controller.Controller):
         
         is_selected = is_selected in ('true', True)
 
+        # Check required fields
         if not user_id or not product_id or not qty:
             return self.response(code=400, description='user_id, product_id and qty is required')
         
-        query = [('user_id', '=', user_id), ('product_id', '=', product_id)]
-        cart = request.env['website.user.cart'].search(query, limit=1)
+        website_user_cart = request.env['website.user.cart']
+        
+        # Remove previous 'buy' entries for the user
+        user_query = ('user_id', '=', user_id)
+        website_user_cart.search([user_query, ('source', '=', 'buy')]).unlink()
+
+        # Prepare query to find existing cart entry for the product
+        query = [user_query, ('product_id', '=', product_id), ('source', '=', 'add_to_cart')]
+        cart = website_user_cart.search(query, limit=1)
         result = {}
         data_to_update = {
             'qty': qty, 
             'is_selected': is_selected, 
             'program_line_id': program_line_id
         }
+
         if source:
             data_to_update['source'] = source
-            
-        if cart:
+
+        if cart and source in (None, 'add_to_cart'):
+            # Update existing cart entry
             cart.write(data_to_update)
             result['id'] = cart.id
         else:
-            create = request.env['website.user.cart'].create({
+            # Create a new cart entry if it doesn't exist
+            create = website_user_cart.create({
                 'user_id': user_id,
                 'product_id': product_id,
                 **data_to_update
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 208789af..a8b2fd11 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -237,8 +237,9 @@ class SaleOrder(controller.Controller):
     def get_user_checkout_so(self, user_id, **kw):
         cart = request.env['website.user.cart']
         voucher_code = kw.get('voucher')
+        source = kw.get('source')
         voucher = request.env['voucher'].search([('code', '=', voucher_code)], limit=1)
-        result = cart.get_user_checkout(user_id, voucher)
+        result = cart.get_user_checkout(user_id, voucher, source)
         return self.response(result)
     
     @http.route(PREFIX_PARTNER + 'sale_order/checkout', auth='public', method=['POST', 'OPTIONS'], csrf=False)
@@ -259,7 +260,8 @@ class SaleOrder(controller.Controller):
             'delivery_amount': ['number', 'default:0'],
             'carrier_id': [],
             'delivery_service_type': [],
-            'voucher': []
+            'voucher': [],
+            'source': []
         })
         
         if not params['valid']:
@@ -297,7 +299,8 @@ class SaleOrder(controller.Controller):
 
         user_id = params['value']['user_id']
         user_cart = request.env['website.user.cart']
-        products = user_cart.get_product_by_user(user_id=user_id, selected=True)
+        source = params['value']['source']
+        products = user_cart.get_product_by_user(user_id=user_id, selected=True, source=source)
         for product in products:
             total_qty = product['quantity']
             price_unit = product['price']['price']
diff --git a/indoteknik_custom/models/website_user_cart.py b/indoteknik_custom/models/website_user_cart.py
index 73f39d23..4d85e64d 100644
--- a/indoteknik_custom/models/website_user_cart.py
+++ b/indoteknik_custom/models/website_user_cart.py
@@ -40,17 +40,24 @@ class WebsiteUserCart(models.Model):
     def get_products(self):
         return [x.get_product() for x in self]
 
-    def get_product_by_user(self, user_id, selected = False):
+    def get_product_by_user(self, user_id, selected=False, source=False):
         user_id = int(user_id)
-        parameters = [('user_id', '=', user_id)]
+        source = source if source else 'add_to_cart'
+
+        parameters = [
+            ('user_id', '=', user_id), 
+            ('source', '=', source)
+        ]
+
         if selected:
             parameters.append(('is_selected', '=', True))
+
         carts = self.search(parameters)
         products = carts.get_products()
         return products
     
-    def get_user_checkout(self, user_id, voucher=False):
-        products = self.get_product_by_user(user_id=user_id, selected=True)
+    def get_user_checkout(self, user_id, voucher=False, source=False):
+        products = self.get_product_by_user(user_id=user_id, selected=True, source=source)
         total_purchase = sum(x['price']['price'] * x['quantity'] for x in products)
         total_discount = sum((x['price']['price'] - x['price']['price_discount']) * x['quantity'] for x in products)
         subtotal = total_purchase - total_discount