Update app.py

app.py

@@ -190,54 +190,81 @@ def reward_status():
         next_tier=next_tier,
         tiers=tiers
     )
-@app.route("/order/items", methods=["GET"])
-def order_items():
-    email = session.get('user_email')  # Fetch logged-in user's email
+@app.route('/order_summary')
+def order_summary():
+    # Get the user email from session (assuming the session is already set during checkout)
+    email = session.get('user_email')
+
     if not email:
-        print("No user email found. Redirecting to login.")
-        return redirect(url_for("login"))
+        print("User not logged in. Redirecting to login.")
+        return "User not logged in", 400
 
+    # Query Salesforce to fetch the most recent order details
     try:
-        # Fetch the most recent order for the user
         print(f"Fetching order details for email: {email}")
-        result = sf.query(f"""
-            SELECT Id, Order_Details__c
+        
+        # Query the Order__c object based on the user's email
+        query = f"""
+            SELECT Id, Customer_Name__c, Customer_Email__c, Total_Amount__c, Order_Details__c, Order_Status__c, Discount__c, Total_Bill__c
             FROM Order__c
             WHERE Customer_Email__c = '{email}'
             ORDER BY CreatedDate DESC
             LIMIT 1
-        """)
-        
-        # Check if the query was successful and print the result
-        print("Query result:", result)
+        """
+        result = sf.query(query)
 
-        order = result.get("records", [])[0] if result.get("records") else None
+        print("Salesforce query result:", result)
 
-        if not order:
-            print("No order found for the user.")
-            return render_template("order_items.html", items=None)
+        # Check if the order record was found
+        if not result.get("records"):
+            print("No order found for this user.")
+            return "No order found for this user", 400
 
-        # Extract item names from the order details
-        item_names = []
-        if order.get("Order_Details__c"):
-            print("Found order details. Extracting item names.")
-            for line in order["Order_Details__c"].split('\n'):
-                item_parts = line.split('|')
-                if item_parts:
-                    item_name = item_parts[0].strip()  # Assuming the item name is the first part
-                    item_names.append(item_name)
-                    print(f"Extracted item: {item_name}")  # Print each extracted item name
+        # Get the most recent order details
+        order = result["records"][0]
+        print(f"Order found: {order}")
 
-        if item_names:
-            print(f"Total items extracted: {len(item_names)}")
-        else:
-            print("No items found in order details.")
+        # Extract details from the order
+        order_details = order.get("Order_Details__c", "")
+        print(f"Order details fetched: {order_details}")
 
-        return render_template("order_items.html", items=item_names)
+        order_items = []
 
+        if order_details:
+            print("Processing order details...")
+            for line in order_details.split('\n'):
+                item_parts = line.split('|')
+                if len(item_parts) >= 5:
+                    item_name = item_parts[0].strip()
+                    item_addons = item_parts[1].strip().replace('Add-Ons:', '')
+                    item_instructions = item_parts[2].strip().replace('Instructions:', '')
+                    item_price = item_parts[3].strip().replace('Price:', '')
+                    item_image_url = item_parts[4].strip().replace('Image:', '')
+                    order_items.append({
+                        "name": item_name,
+                        "addons": item_addons,
+                        "instructions": item_instructions,
+                        "price": item_price,
+                        "image_url": item_image_url
+                    })
+                    print(f"Extracted item: {item_name} with price {item_price}")
+
+        if not order_items:
+            print("No items found in order details.")
+        else:
+            print(f"Total items extracted: {len(order_items)}")
+
+        # Pass these values to your template
+        return render_template(
+            'order_summary.html',
+            order=order,
+            order_items=order_items
+        )
+    
     except Exception as e:
-        print(f"Error fetching order details: {str(e)}")
-        return render_template("order_items.html", items=None, error=str(e))
+        print(f"Error querying Salesforce: {str(e)}")
+        return f"Error querying Salesforce: {str(e)}", 500
+
 
 @app.route("/logout")
 def logout():