Update app.py

app.py

@@ -425,7 +425,7 @@ def send_email_notification(order_details):
     # Construct the email payload. Adjust values as needed.
     payload = {
         "from": "yungdml31@gmail.com",
-        "to": "samyung05@gmail.com, angelofoodcourt@gmail.com",  # You can also use a comma-separated list for multiple recipients.
+        "to": "samyung05@gmail.com",  # You can also use a comma-separated list for multiple recipients.
         "subject": f"New Order Received: {order_details['order_id']}",
         "body": (
             f"New Order Received:\n"
@@ -624,36 +624,50 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 f"Your delivery address is: {state.data['address']}.\n"
                 f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
 
-    # 5) Step 5: Ask about extras.
+    # Step 5: Ask about extras.
     if state and state.flow == "order" and state.step == 5:
-        if message.lower() in ["yes", "y"]:
+        normalized = message.strip().lower()
+        if normalized in ["yes", "y"]:
             state.step = 6
             return "Please list the extras you'd like (e.g., drinks, sides)."
-        elif message.lower() in ["no", "n"]:
+        elif normalized in ["no", "n"]:
             state.data["extras"] = ""
             state.step = 7
-            # Prepare order summary for confirmation.
-            if "orders" in state.data:
-                # Multi-dish order summary:
+            # Build order summary for confirmation:
+            if "orders" in state.data:  # Multiple-dish order
                 summary = "\n".join([f"{qty} serving(s) of {dish}" for dish, qty in state.data["orders"].items()])
                 quantity_total = sum(state.data["orders"].values())
                 dish_summary = ", ".join(state.data["orders"].keys())
-            else:
+            else:  # Single-dish order
                 summary = f"{state.data.get('quantity', 1)} serving(s) of {state.data.get('dish', '')}"
                 quantity_total = state.data.get("quantity", 1)
                 dish_summary = state.data.get("dish", "")
-            price_per_serving = get_dish_price(state.data.get("dish", "")) if "dish" in state.data else 0
-            total_price = (quantity_total * price_per_serving) + state.data.get("shipping_cost", 0)
-            confirmation = (f"Order Summary:\nDish(es): {dish_summary}\nQuantity: {quantity_total}\n"
-                            f"Phone: {state.data.get('phone_number', '')}\n"
-                            f"Address: {state.data.get('address', '')}\n"
-                            f"Shipping Cost: N{state.data.get('shipping_cost', 0)}\n"
-                            f"Total Price: N{total_price}\n"
-                            f"Extras: None\nConfirm order? (yes/no)")
+            # Determine the price correctly
+            if "dish" in state.data:
+                price_per_serving = get_dish_price(state.data["dish"])
+                total_price = (quantity_total * price_per_serving) + state.data.get("shipping_cost", 0)
+            elif "orders" in state.data:
+                total_price = 0
+                for dish, qty in state.data["orders"].items():
+                    total_price += get_dish_price(dish) * qty
+                total_price += state.data.get("shipping_cost", 0)
+            else:
+                total_price = state.data.get("shipping_cost", 0)
+            confirmation = (
+                f"Order Summary:\n"
+                f"Dish(es): {dish_summary}\n"
+                f"Quantity: {quantity_total}\n"
+                f"Phone: {state.data.get('phone_number', '')}\n"
+                f"Address: {state.data.get('address', '')}\n"
+                f"Shipping Cost: N{state.data.get('shipping_cost', 0)}\n"
+                f"Total Price: N{total_price}\n"
+                f"Extras: None\nConfirm order? (yes/no)"
+            )
             return confirmation
         else:
             return "Please respond with 'yes' or 'no' regarding extras."
 
+
     # 6) Step 6: Process extras list.
     if state and state.flow == "order" and state.step == 6:
         state.data["extras"] = message
@@ -712,27 +726,6 @@ async def process_order_flow(user_id: str, message: str) -> str:
             asyncio.create_task(save_order())
             asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
 
-            # Send email notification to admin via SMTP (using your SMTP integration)
-            admin_emails = os.getenv("ADMIN_EMAILS", "samyung05@gmail.com").split(",")
-            email_subject = f"New Order Received: {order_id}"
-            email_body = (
-                f"New Order Received:\n"
-                f"Order ID: {order_id}\n"
-                f"Dish(es): {dish_summary}\n"
-                f"Quantity: {quantity_total}\n"
-                f"Total Price: N{total_price}\n"
-                f"Phone: {state.data.get('phone_number', '')}\n"
-                f"Delivery Address: {state.data.get('address', 'Not Provided')}\n"
-                f"Extras: {state.data.get('extras', 'None')}\n"
-                f"Status: Pending Payment"
-            )
-            # Call your SMTP API or use a helper to send email:
-            email_sent = send_email_notification(admin_emails, email_subject, email_body)
-            if email_sent:
-                print("Email notification sent successfully.")
-            else:
-                print("Failed to send email notification.")
-
             email_for_paystack = "customer@example.com"  # Replace with actual email if available
             payment_data = create_paystack_payment_link(email_for_paystack, total_price * 100, order_id)
             state.reset()