Update app.py

app.py

@@ -52,39 +52,32 @@ from flask import render_template
 from simple_salesforce import Salesforce
 import json
 
+@app.route("/order-history")
+def order_history():
+    email = session.get('user_email')  # Get the logged-in user's email
 
-@app.route('/previous_orders')
-def previous_orders():
-    email = '[email protected]'  # Get the email dynamically (e.g., from session or request)
-    
-    # Query Salesforce to fetch previous orders based on the email
-    query = f"SELECT Order_Details__c, Total_Amount__c, Order_Date__c FROM Order__c WHERE Customer_Email__c = '{email}'"
-    orders = sf.query(query)
-    
-    # Process each order and extract details
-    processed_orders = []
-    for order in orders['records']:
-        order_details = order['Order_Details__c']
-        items = order_details.split('\n')
-        order_items = []
-        
-        for item in items:
-            item_parts = item.split('|')
-            order_items.append({
-                'name': item_parts[0].strip(),
-                'addons': item_parts[1].strip().replace('Add-Ons:', ''),
-                'instructions': item_parts[2].strip().replace('Instructions:', ''),
-                'price': item_parts[3].strip().replace('Price:', ''),
-                'image': item_parts[4].strip().replace('Image:', ''),
-            })
+    if not email:
+        return redirect(url_for("login"))  # If not logged in, redirect to login
+
+    try:
+        # Fetch order records for the logged-in user
+        result = sf.query(f"""
+            SELECT Id, Customer_Name__c, Customer_Email__c, Total_Amount__c, 
+                   Order_Details__c, Order_Status__c, Discount__c, Total_Bill__c, CreatedDate
+            FROM Order__c
+            WHERE Customer_Email__c = '{email}'
+            ORDER BY CreatedDate DESC
+            LIMIT 5
+        """)
+
+        orders = result.get("records", [])  # Get the order records (max 5)
         
-        processed_orders.append({
-            'items': order_items,
-            'total_amount': order['Total_Amount__c'],
-            'order_date': order['Order_Date__c']
-        })
-    
-    return render_template('previous_orders.html', orders=processed_orders)
+        return render_template("order_history.html", orders=orders)  # Pass to template
+
+    except Exception as e:
+        print(f"Error fetching order history: {str(e)}")
+        return render_template("order_history.html", orders=[], error=str(e))
+
 
 
 @app.route("/signup", methods=["GET", "POST"])