Update order.py

order.py

@@ -5,6 +5,8 @@ order_blueprint = Blueprint('order', __name__)
 
 # Initialize Salesforce connection
 sf = get_salesforce_connection()
+
+
 @order_blueprint.route("/order", methods=["GET"])
 def order_summary():
     email = session.get('user_email')  # Fetch logged-in user's email
@@ -12,20 +14,27 @@ def order_summary():
         return redirect(url_for("login"))
 
     try:
-        # Fetch the most recent order for the user
+        # Fetch all pending orders for the 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
+            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}'
+            WHERE Customer_Email__c = '{email}' AND Billing_Status__c = 'pending'
             ORDER BY CreatedDate DESC
-            LIMIT 1
         """)
-        order = result.get("records", [])[0] if result.get("records") else None
+        orders = result.get("records", [])
+
+        if not orders:
+            return render_template("order.html", orders=None, total_subtotal=0, total_discount=0, total_bill=0)
 
-        if not order:
-            return render_template("order.html", order=None)
+        # Calculate aggregate totals
+        total_subtotal = sum(float(order['Total_Amount__c']) for order in orders)
+        total_discount = sum(float(order['Discount__c']) for order in orders)
+        total_bill = sum(float(order['Total_Bill__c']) for order in orders)
 
-        return render_template("order.html", order=order)
+        return render_template("order.html", orders=orders, total_subtotal=total_subtotal, 
+                             total_discount=total_discount, total_bill=total_bill)
     except Exception as e:
         print(f"Error fetching order details: {str(e)}")
-        return render_template("order.html", order=None, error=str(e))
+        return render_template("order.html", orders=None, total_subtotal=0, total_discount=0, 
+                             total_bill=0, error=str(e))