Update app.py

app.py

@@ -398,17 +398,23 @@ def match_dish(user_input: str, threshold: int = 70) -> str:
 
 # Enhanced matching function: returns a list of dish names that match the user input.
 def match_dishes(user_input: str, threshold: int = 70) -> list:
+    """
+    Returns a list of dish names from the menu that exactly appear as whole words in the user input.
+    If not, falls back to fuzzy matching.
+    """
     matched_dishes = []
     user_input_lower = user_input.lower()
     for item in menu_items:
         dish_name = item["name"]
-        # Direct substring check
-        if dish_name.lower() in user_input_lower:
+        # Use regex with word boundaries to match the dish name exactly.
+        pattern = r'\b' + re.escape(dish_name.lower()) + r'\b'
+        if re.search(pattern, user_input_lower):
             matched_dishes.append(dish_name)
         else:
             score = fuzz.token_sort_ratio(user_input_lower, dish_name.lower())
             if score >= threshold:
                 matched_dishes.append(dish_name)
+    # Remove duplicates if any.
     return list(set(matched_dishes))
 
 def get_dish_price(dish: str) -> int:
@@ -716,18 +722,22 @@ async def process_order_flow(user_id: str, message: str) -> str:
         if message.lower() in ["yes", "y"]:
             order_id = f"ORD-{int(time.time())}"
             state.data["order_id"] = order_id
-            # Calculate total price differently for multi-dish orders:
+    
+            # Calculate total price based on single-dish or multi-dish order
             if "orders" in state.data:
                 total_price = 0
                 for dish, qty in state.data["orders"].items():
                     total_price += get_dish_price(dish) * qty
+                # Add shipping cost (assumed once for the entire order)
                 total_price += state.data.get("shipping_cost", 0)
                 dish_summary = ", ".join(state.data["orders"].keys())
                 quantity_total = sum(state.data["orders"].values())
             else:
+                # Single-dish order
                 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)
+            
             state.data["price"] = str(total_price)
     
             async def save_order():
@@ -746,8 +756,28 @@ 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."))
     
-            # Email notification and payment link code here (omitted for brevity)
-            email_for_paystack = "customer@example.com"
+            # Email notification to admin (using your SMTP integration)
+            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_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.")
+    
+            # Generate Paystack payment link (amount in kobo)
+            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:
@@ -771,10 +801,8 @@ async def process_order_flow(user_id: str, message: str) -> str:
                         "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."
+            # Instead of immediately canceling, re-prompt for confirmation.
+            return "Please confirm your order by typing 'yes' to confirm or 'no' to cancel."
 
     # Final fallback
     return ""