Update app.py

app.py

@@ -164,10 +164,9 @@ def add_to_cart():
         return jsonify({"success": False, "error": "Item name and price are required."})
 
     try:
-        # Query the cart to check if the item already exists with the same instructions
+        # Query the cart to check if the item already exists
         query = f"""
-            SELECT Id, Quantity__c, Add_Ons__c, Instructions__c 
-            FROM Cart_Item__c 
+            SELECT Id, Quantity__c, Add_Ons__c, Add_Ons_Price__c, Instructions__c FROM Cart_Item__c
             WHERE Customer_Email__c = '{customer_email}' AND Name = '{item_name}'
         """
         result = sf.query(query)
@@ -177,33 +176,57 @@ def add_to_cart():
         addons_price = sum(addon['price'] for addon in addons)  # New add-ons price
         new_addons = "; ".join([f"{addon['name']} (${addon['price']})" for addon in addons])  # Format new add-ons
 
-        # Check for the same instructions
-        matched_item = None
-        for item in cart_items:
-            if item.get('Instructions__c', '') == instructions:
-                matched_item = item
-                break
-
-        if matched_item:
-            # If the item already exists with the same instructions, update it
-            cart_item_id = matched_item['Id']
-            existing_quantity = matched_item['Quantity__c']
-
+        if cart_items:
+            # If the item already exists in the cart, update it
+            cart_item_id = cart_items[0]['Id']
+            existing_quantity = cart_items[0]['Quantity__c']
+            existing_addons = cart_items[0].get('Add_Ons__c', "None")  # Previous add-ons
+            existing_addons_price = cart_items[0].get('Add_Ons_Price__c', 0)  # Previous add-ons price
+            existing_instructions = cart_items[0].get('Instructions__c', "")  # Previous instructions
+
+            # Combine the existing and new add-ons
+            combined_addons = existing_addons if existing_addons != "None" else ""
+            if new_addons:
+                combined_addons = f"{combined_addons}; {new_addons}".strip("; ")
+
+            # Combine the existing and new instructions
+            combined_instructions = existing_instructions
+            if instructions:
+                combined_instructions = f"{combined_instructions} | {instructions}".strip(" | ")
+
+            # Recalculate the total add-ons price
+            combined_addons_list = combined_addons.split("; ")
+            combined_addons_price = sum(
+                float(addon.split("($")[1][:-1]) for addon in combined_addons_list if "($" in addon
+            )
+
+            # Update the item in the cart
             sf.Cart_Item__c.update(cart_item_id, {
-                "Quantity__c": existing_quantity + 1  # Increase quantity by 1
+                "Quantity__c": existing_quantity + 1,  # Increase quantity by 1
+                "Add_Ons__c": combined_addons,  # Update add-ons list
+                "Add_Ons_Price__c": combined_addons_price,  # Update add-ons price
+                "Instructions__c": combined_instructions,  # Update instructions
+                "Price__c": (existing_quantity + 1) * item_price + combined_addons_price,  # Update total price
             })
         else:
-            # If instructions are different or item doesn't exist, create a new cart item
+            # If the item does not exist in the cart, create a new one
+            addons_string = "None"
+            if addons:
+                addons_string = new_addons  # Use the formatted add-ons string
+
+            total_price = item_price + addons_price  # Base price + add-ons price
+
+            # Create a new cart item
             sf.Cart_Item__c.create({
-                "Name": item_name,
-                "Price__c": item_price + addons_price,
-                "Base_Price__c": item_price,
-                "Quantity__c": 1,
-                "Add_Ons__c": new_addons,
-                "Add_Ons_Price__c": addons_price,
-                "Image1__c": item_image,
-                "Customer_Email__c": customer_email,
-                "Instructions__c": instructions  # Save the new instructions
+                "Name": item_name,  # Item name
+                "Price__c": total_price,  # Total price (item + add-ons)
+                "Base_Price__c": item_price,  # Base price without add-ons
+                "Quantity__c": 1,  # Default quantity is 1
+                "Add_Ons_Price__c": addons_price,  # Total add-ons price
+                "Add_Ons__c": addons_string,  # Add-ons with names and prices
+                "Image1__c": item_image,  # Item image URL
+                "Customer_Email__c": customer_email,  # Associated customer's email
+                "Instructions__c": instructions  # Save instructions
             })
 
         return jsonify({"success": True, "message": "Item added to cart successfully."})