Update app.py

app.py

@@ -501,14 +501,14 @@ def match_dishes(user_input: str, threshold: int = 70) -> list:
     
     return list(set(matched_dishes))
 
-def get_dish_price(dish: str) -> int:
-    for item in menu_items:
-        if item["name"].lower() == dish.lower():
-            return item["price"]
-    return 0  # or raise an error if dish not found
+# def get_dish_price(dish: str) -> int:
+#     for item in menu_items:
+#         if item["name"].lower() == dish.lower():
+#             return item["price"]
+#     return 0  # or raise an error if dish not found
 
 # Fetch dish price from the MenuItem table
-async def get_dish_price_two(dish: str) -> int:
+async def get_dish_price(dish: str) -> int:
     async with async_session() as session:
         # Using ilike() for case-insensitive matching
         result = await session.execute(select(MenuItem).where(MenuItem.name.ilike(dish)))
@@ -727,7 +727,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 "Please provide your phone number and delivery address.")
 
     # Step 4: Parse phone & address (for single or multi-dish orders), then skip extras.
-    # --- Step 4: Parse phone & address, compute order summary, and jump to confirmation ---
+    # --- Step 4: Parse phone & address, compute shipping cost, and jump to confirmation ---
     if state and state.flow == "order" and state.step == 3:
         phone_pattern = r'(\+?\d{10,15})'
         phone_match = re.search(phone_pattern, message)
@@ -747,27 +747,30 @@ async def process_order_flow(user_id: str, message: str) -> str:
                         "For example: '09162409591, 1, Iyana Isashi, Isashi, Lagos'.")
         if not state.data.get("address"):
             return "Thank you. Please provide your delivery address."
-        shipping_cost = calculate_shipping_cost(state.data["address"])
+        # Get shipping cost from the database
+        shipping_cost = await get_shipping_cost(state.data["address"])
         state.data["shipping_cost"] = shipping_cost
     
-        # Automatically set extras to empty since we're not using extras anymore.
+        # Automatically set extras to empty (since we're not using extras)
         state.data["extras"] = ""
+        
+        # Jump directly to order confirmation (Step 7)
+        state.step = 7
     
-        # Compute order summary details:
+        # For order summary, determine dish summary and quantity:
         if "orders" in state.data:
             dish_summary = ", ".join(state.data["orders"].keys())
             quantity_total = sum(state.data["orders"].values())
             total_price = 0
             for dish, qty in state.data["orders"].items():
-                total_price += get_dish_price(dish) * qty
+                total_price += (await get_dish_price(dish)) * qty
             total_price += shipping_cost
         else:
             dish_summary = state.data.get("dish", "")
             quantity_total = state.data.get("quantity", 1)
-            total_price = (quantity_total * get_dish_price(dish_summary)) + shipping_cost
+            dish_price = await get_dish_price(dish_summary)
+            total_price = (quantity_total * dish_price) + shipping_cost
     
-        # Skip extras prompt and jump directly to confirmation (Step 7)
-        state.step = 7
         return (f"Order Summary:\n"
                 f"Dish(es): {dish_summary}\n"
                 f"Quantity: {quantity_total}\n"
@@ -778,24 +781,28 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 "Confirm order? (yes/no)")
 
 
+
     
     # 7) Step 7: Order Confirmation and Payment Link Generation
     if state and state.flow == "order" and state.step == 7:
         if message.lower() in ["yes", "y"]:
             order_id = f"ORD-{int(time.time())}"
             state.data["order_id"] = order_id
+    
             # Calculate total price:
             if "orders" in state.data:
                 total_price = 0
                 for dish, qty in state.data["orders"].items():
-                    total_price += get_dish_price(dish) * qty
+                    total_price += (await get_dish_price(dish)) * qty
                 total_price += state.data.get("shipping_cost", 0)
                 dish_summary = ", ".join(state.data["orders"].keys())
                 quantity_total = sum(state.data["orders"].values())
             else:
                 dish_summary = state.data.get("dish", "")
                 quantity_total = state.data.get("quantity", 1)
-                total_price = (quantity_total * get_dish_price(dish_summary)) + state.data.get("shipping_cost", 0)
+                dish_price = await get_dish_price(dish_summary)
+                total_price = (quantity_total * dish_price) + state.data.get("shipping_cost", 0)
+            
             state.data["price"] = str(total_price)
     
             async def save_order():
@@ -814,10 +821,7 @@ 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."))
     
-            # Automatically set extras to empty
-            state.data["extras"] = ""
-            
-            # Prepare order details as a dictionary for the email notification.
+            # Prepare order details for email notification.
             order_details = {
                 "order_id": order_id,
                 "dish": dish_summary,
@@ -827,14 +831,26 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 "address": state.data.get("address", "Not Provided"),
                 "extras": state.data.get("extras", "None")
             }
+            admin_emails = os.getenv("ADMIN_EMAILS", "admin@example.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"
+            )
             email_response = send_email_notification(order_details)
             if email_response:
                 print("Email notification sent successfully.")
             else:
                 print("Failed to send email notification.")
     
-            # Generate Paystack payment link (amount in kobo)
-            email_for_paystack = "customer@example.com"
+            email_for_paystack = "customer@example.com"  # Replace with user's email if available
             payment_data = create_paystack_payment_link(email_for_paystack, total_price * 100, order_id)
             state.reset()
             if user_id in user_state:
@@ -855,15 +871,15 @@ async def process_order_flow(user_id: str, message: str) -> str:
             else:
                 return (f"Your order has been placed with Order ID {order_id}, "
                         "but we could not initialize online payment. Please try again later, or "
-                        "you may opt to pay via bank transfer to Account Number: 1433042821, Access Bank, Angelo Food Court 2 "
+                        "you may opt to pay via bank transfer to Account Number 1433042821, Access Bank, Angelo Food Court 2 "
                         "and send your payment screenshot to this chatbot.")
         elif message.lower() in ["no", "n"]:
             state.reset()
             if user_id in user_state:
                 del user_state[user_id]
             return "Order canceled. Let me know if you'd like to try again."
-    else:
-        return "I didn't understand that. Please type 'yes' to confirm your order or 'no' to cancel it."
+        else:
+            return "I didn't understand that. Please type 'yes' to confirm your order or 'no' to cancel it."
 
     return ""