Update app.py

app.py

@@ -134,6 +134,17 @@ menu_items = [
     {"name": "Banga Soup", "description": "Traditional dish with catfish", "price": 5000, "nutrition": "Calories: 600 kcal, Carbs: 50g, Protein: 35g, Fat: 15g"}
 ]
 
+nigerian_drinks = [
+    {"name": "Chapman", "description": "Popular Nigerian cocktail with a fruity, fizzy taste", "price": 1500, "nutrition": "Calories: 180 kcal, Carbs: 40g, Protein: 1g, Fat: 0g"},
+    {"name": "VitaMilk", "description": "Healthy, protein-rich plant-based milk", "price": 1000, "nutrition": "Calories: 180 kcal, Carbs: 20g, Protein: 8g, Fat: 6g"},
+    {"name": "Malt Drink", "description": "Non-alcoholic malt-based drink", "price": 1000, "nutrition": "Calories: 200 kcal, Carbs: 50g, Protein: 2g, Fat: 0g"},
+    {"name": "Soft Drinks", "description": "Carbonated sodas like Coke, Fanta, and Sprite", "price": 800, "nutrition": "Calories: 150 kcal, Carbs: 39g, Protein: 0g, Fat: 0g"},
+    {"name": "Bottled Water", "description": "Pure, refreshing drinking water", "price": 500, "nutrition": "Calories: 0 kcal, Carbs: 0g, Protein: 0g, Fat: 0g"},
+    {"name": "Energy Drink", "description": "Boost of energy with caffeine and vitamins", "price": 1500, "nutrition": "Calories: 200 kcal, Carbs: 50g, Protein: 1g, Fat: 0g"}
+]
+
+menu_items.extend(nigerian_drinks)
+
 
 class ConversationState:
     def __init__(self):
@@ -630,11 +641,10 @@ async def process_order_flow(user_id: str, message: str) -> str:
         return (f"Got it. {quantity} serving(s) of {dish}.\n"
                 "Please provide your phone number and delivery address.")
 
-    # 4) If state.step == 3: parse phone & address
+    # Step 4: Parse phone & address (for single or multi-dish orders), then skip extras.
     if state and state.flow == "order" and state.step == 3:
         phone_pattern = r'(\+?\d{10,15})'
         phone_match = re.search(phone_pattern, message)
-        address = None
         if phone_match:
             phone_number = phone_match.group(1)
             address_start = phone_match.end()
@@ -649,88 +659,26 @@ async def process_order_flow(user_id: str, message: str) -> str:
             else:
                 return ("Please provide both your phone number and address. "
                         "For example: '09162409591, 1, Iyana Isashi, Isashi, Lagos'.")
-        if "address" not in state.data:
+        if not state.data.get("address"):
             return "Thank you. Please provide your delivery address."
         shipping_cost = calculate_shipping_cost(state.data["address"])
         state.data["shipping_cost"] = shipping_cost
-        state.step = 5
+        # Automatically set extras to empty since we're not using extras anymore.
+        state.data["extras"] = ""
+        # Skip extras prompt and jump directly to confirmation (Step 7)
+        state.step = 7
         return (f"Thanks! Your phone number is recorded as: {state.data['phone_number']}.\n"
                 f"Your delivery address is: {state.data['address']}.\n"
-                f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
-
-    # Step 5: Ask about extras.
-    if state and state.flow == "order" and state.step == 5:
-        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 normalized in ["no", "n"]:
-            state.data["extras"] = ""
-            state.step = 7
-            # 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:  # 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", "")
-            # 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
-        state.step = 7
-        if "orders" in state.data:
-            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:
-            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: {state.data.get('extras', 'None')}\nConfirm order? (yes/no)")
-        return confirmation
+                f"Your delivery cost is N{shipping_cost}.\n"
+                "Here is your order summary. Please confirm your 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 based on whether it's a single-dish or multi-dish order.
+            # Calculate total price:
             if "orders" in state.data:
                 total_price = 0
                 for dish, qty in state.data["orders"].items():
@@ -742,7 +690,6 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 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():
@@ -761,6 +708,9 @@ 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.
             order_details = {
                 "order_id": order_id,
@@ -778,7 +728,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 print("Failed to send email notification.")
     
             # Generate Paystack payment link (amount in kobo)
-            email_for_paystack = "customer@example.com"  # Replace as needed
+            email_for_paystack = "customer@example.com"
             payment_data = create_paystack_payment_link(email_for_paystack, total_price * 100, order_id)
             state.reset()
             if user_id in user_state:
@@ -799,11 +749,13 @@ 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"]:
-            # Instead of canceling immediately, re-prompt for confirmation.
-            return "Please confirm your order by typing 'yes' to confirm your order or 'no' to cancel it."
+            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."