Update app.py (#1)

app.py

@@ -142,12 +142,13 @@ def cart():
         """)
         cart_items = result.get("records", [])
 
-        # Process add-ons if present
+        # Calculate the subtotal, including add-ons prices
+        subtotal = sum(item['Price__c'] * item['Quantity__c'] for item in cart_items)
+
+        # Ensure add-ons are processed properly
         for item in cart_items:
             item['Add_Ons__c'] = item.get('Add_Ons__c', "None")  # Default to "None" if no add-ons
 
-        # Calculate subtotal
-        subtotal = sum(item['Quantity__c'] * item['Price__c'] for item in cart_items)
     except Exception as e:
         print(f"Error fetching cart items: {e}")
         cart_items = []
@@ -155,28 +156,38 @@ def cart():
 
     return render_template("cart.html", cart_items=cart_items, subtotal=subtotal)
 
+
 @app.route('/cart/add', methods=['POST'])
 def add_to_cart():
     data = request.json  # Extract JSON payload
     item_name = data.get('itemName').strip()
-    item_price = data.get('itemPrice')
+    item_price = data.get('itemPrice')  # Base price of the item
     item_image = data.get('itemImage')
     addons = data.get('addons', [])  # Extract add-ons array
-    customer_email = session.get('user_email')  # Logged-in user's email
+    customer_email = session.get('user_email')  # Get the logged-in user's email
 
     if not item_name or not item_price:
         return jsonify({"success": False, "error": "Item name and price are required."})
 
-    # Convert add-ons array to a semicolon-separated string with names and prices
-    addons_string = ";".join([f"{addon['name']} (${addon['price']})" for addon in addons]) if addons else "None"
+    # Convert add-ons array to a formatted string and calculate the add-ons total price
+    addons_string = "None"
+    addons_total_price = 0
+    if addons:
+        addons_details = [f"{addon['name']} (${addon['price']})" for addon in addons]
+        addons_total_price = sum(addon['price'] for addon in addons)
+        addons_string = "; ".join(addons_details)
+
+    # Calculate the total price (item price + add-ons)
+    total_price = item_price + addons_total_price
 
     try:
         # Save the cart item in Salesforce
         sf.Cart_Item__c.create({
             "Name": item_name,  # Item name
-            "Price__c": item_price,  # Item price
+            "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__c": addons_string,  # Add-ons string
+            "Add_Ons__c": addons_string,  # Add-ons with name and price
             "Image1__c": item_image,  # Item image URL
             "Customer_Email__c": customer_email,  # Associated customer's email
         })
@@ -292,16 +303,22 @@ def checkout():
     user_id = session.get('user_id')
     if not email or not user_id:
         return jsonify({"success": False, "message": "User not logged in"})
+
     try:
+        # Fetch cart items for the user
         result = sf.query(f"""
             SELECT Id, Name, Price__c, Quantity__c, Add_Ons__c
             FROM Cart_Item__c
             WHERE Customer_Email__c = '{email}'
         """)
-        cart_items = result["records"]
+        cart_items = result.get("records", [])
         if not cart_items:
             return jsonify({"success": False, "message": "Cart is empty"})
-        total_price = sum(item['Quantity__c'] * item['Price__c'] for item in cart_items)
+
+        # Calculate the total price of the order
+        total_price = sum(item['Price__c'] * item['Quantity__c'] for item in cart_items)
+
+        # Create the order in Salesforce
         order_data = {
             "Customer_Name__c": user_id,
             "Customer_Email__c": email,
@@ -313,14 +330,17 @@ def checkout():
             "Add_Ons__c": "\n".join(
                 [item['Add_Ons__c'] if item.get('Add_Ons__c') else "None" for item in cart_items]
             ),
-
         }
         sf.Order__c.create(order_data)
+
+        # Clear the cart after placing the order
         for item in cart_items:
             sf.Cart_Item__c.delete(item["Id"])
+
         return jsonify({"success": True, "message": "Order placed successfully!"})
     except Exception as e:
         return jsonify({"success": False, "error": str(e)})
 
+
 if __name__ == "__main__":
     app.run(debug=False, host="0.0.0.0", port=7860)