Update order.py

order.py

@@ -18,24 +18,41 @@ def order_summary():
             FROM Order__c
             WHERE Customer_Email__c = '{email}'
             ORDER BY CreatedDate DESC
-            LIMIT 1
+            LIMIT 2
         """)
-        order = result.get("records", [])[0] if result.get("records") else None
+        
+        orders = result.get("records", [])
+        current_order = orders[0] if orders else None
+        previous_order = orders[1] if len(orders) > 1 else None
+        
+        # Check if previous order exists and if Billing_Status is Pending
+        if previous_order and previous_order.get('Billing_Status__c') == 'Pending':
+            # Combine details from previous order with the current order
+            combined_order_details = f"{previous_order['Order_Details__c']}\n{current_order['Order_Details__c']}"
+            combined_total = previous_order['Total_Bill__c'] + current_order['Total_Bill__c']
+            combined_discount = previous_order['Discount__c'] + current_order['Discount__c']
+            combined_total_bill = combined_total - combined_discount
+            
+            # Update the previous order's Billing Status to "Completed" after combining the details
+            sf.update('Order__c', previous_order['Id'], {
+                'Billing_Status__c': 'Completed',
+            })
+            
+            # Prepare the combined order object
+            order = {
+                'Order_Details__c': combined_order_details,
+                'Total_Amount__c': current_order['Total_Amount__c'],
+                'Discount__c': combined_discount,
+                'Total_Bill__c': combined_total_bill,
+                'Order_Status__c': current_order['Order_Status__c'],
+                'Billing_Status__c': 'Completed',  # Mark as completed
+            }
 
-        # Fetch the previous order if its Billing_Status__c is 'Pending'
-        pending_result = sf.query(f"""
-            SELECT Id, Order_Details__c, Total_Bill__c, Discount__c
-            FROM Order__c
-            WHERE Customer_Email__c = '{email}' AND Billing_Status__c = 'Pending'
-            ORDER BY CreatedDate DESC
-            LIMIT 1
-        """)
-        pending_order = pending_result.get("records", [])[0] if pending_result.get("records") else None
-
-        if not order:
-            return render_template("order.html", order=None, pending_order=None)
-
-        return render_template("order.html", order=order, pending_order=pending_order)
+        else:
+            # No previous order with pending billing status
+            order = current_order
+        
+        return render_template("order.html", order=order)
     
     except Exception as e:
         print(f"Error fetching order details: {str(e)}")