Update app.py

app.py

@@ -150,7 +150,6 @@ def cart():
         print(f"Error fetching cart items: {e}")
         return render_template("cart.html", cart_items=[], subtotal=0)
 
-
 @app.route('/cart/add', methods=['POST'])
 def add_to_cart():
     data = request.json  # Extract JSON payload from frontend
@@ -158,6 +157,7 @@ def add_to_cart():
     item_price = data.get('itemPrice')  # Base price of the item
     item_image = data.get('itemImage')  # Item image
     addons = data.get('addons', [])  # Add-ons array
+    instructions = data.get('instructions', '')  # Special instructions
     customer_email = session.get('user_email')  # Get logged-in user's email
 
     if not item_name or not item_price:
@@ -166,7 +166,7 @@ def add_to_cart():
     try:
         # Query the cart to check if the item already exists
         query = f"""
-            SELECT Id, Quantity__c, Add_Ons__c, Add_Ons_Price__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)
@@ -180,45 +180,24 @@ def add_to_cart():
             # 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
-
-            # 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("; ")
-
-            # 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
-            )
+            combined_instructions = instructions if instructions else cart_items[0].get('Instructions__c', '')
 
-            # Update the item in the cart
             sf.Cart_Item__c.update(cart_item_id, {
                 "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
-                "Price__c": (existing_quantity + 1) * item_price + combined_addons_price,  # Update total price
+                "Instructions__c": combined_instructions,  # Update instructions
             })
         else:
             # 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,  # 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
+                "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 instructions
             })
 
         return jsonify({"success": True, "message": "Item added to cart successfully."})
@@ -227,6 +206,7 @@ def add_to_cart():
         return jsonify({"success": False, "error": str(e)})
 
 
+
 @app.route("/cart/add_item", methods=["POST"])
 def add_item_to_cart():
     data = request.json  # Extract JSON data from the request
@@ -349,15 +329,15 @@ def update_quantity():
         return jsonify({"success": False, "error": str(e)}), 500
 @app.route("/checkout", methods=["POST"])
 def checkout():
-    email = session.get('user_email')  # Fetch logged-in user's email
-    user_id = session.get('user_id')  # Fetch logged-in user's ID
+    email = session.get('user_email')
+    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, Add_Ons_Price__c, Quantity__c, Add_Ons__c
+            SELECT Id, Name, Price__c, Add_Ons_Price__c, Quantity__c, Add_Ons__c, Instructions__c
             FROM Cart_Item__c
             WHERE Customer_Email__c = '{email}'
         """)
@@ -368,19 +348,21 @@ def checkout():
         # Calculate the total price of the order
         total_price = sum(item['Price__c'] for item in cart_items)
 
-        # Concatenate order details for all items
-        order_details = "\n".join([
-            f"{item['Name']} (Qty: {item['Quantity__c']}, Add-Ons: {item.get('Add_Ons__c', 'None')}, Price: ${item['Price__c']})"
-            for item in cart_items
-        ])
+        # Format order details including instructions
+        order_details = []
+        for item in cart_items:
+            details = f"{item['Name']} (Qty: {item['Quantity__c']}, Add-Ons: {item['Add_Ons__c'] or 'None'}, Price: ${item['Price__c']})"
+            if item.get('Instructions__c'):  # Include instructions if available
+                details += f", Instructions: {item['Instructions__c']}"
+            order_details.append(details)
 
         # Create the order in Salesforce
         order_data = {
             "Customer_Name__c": user_id,
             "Customer_Email__c": email,
             "Total_Amount__c": total_price,
-            "Order_Status__c": "Pending",  # Default status
-            "Order_Details__c": order_details  # Storing concatenated order details
+            "Order_Status__c": "Pending",
+            "Order_Details__c": "\n".join(order_details)  # Store all item details
         }
         sf.Order__c.create(order_data)
 
@@ -388,11 +370,11 @@ def checkout():
         for item in cart_items:
             sf.Cart_Item__c.delete(item["Id"])
 
-        # Return success response with redirect URL
-        return jsonify({"success": True, "redirect": "/order", "message": "Order placed successfully!"})
+        return jsonify({"success": True, "message": "Order placed successfully!"})
     except Exception as e:
         print(f"Error during checkout: {str(e)}")
         return jsonify({"success": False, "error": str(e)})
+
 @app.route("/order", methods=["GET"])
 def order_summary():
     email = session.get('user_email')  # Fetch logged-in user's email