Update app.py

app.py

@@ -238,8 +238,11 @@ def process_order_flow(user_id: str, message: str) -> str:
     Implements an FSM-based order flow that:
       - Step 1: Expects the user to mention a dish name (optionally with quantity)
       - Step 2: Asks for quantity if not provided
-      - Step 3: Requests the delivery address
-      - Step 4: Asks for order confirmation (yes/no) and finalizes the order
+      - Step 3: Requests the user's phone number if not already provided
+      - Step 4: Requests the delivery address and validates that it includes "OJO LGA, Lagos"
+      - Step 5: Asks if they would like to add any extras (e.g., sides or drinks)
+      - Step 6: Captures extras details if applicable
+      - Step 7: Asks for order confirmation and finalizes the order
     """
     # Retrieve or initialize conversation state
     state = user_state.get(user_id)
@@ -248,7 +251,7 @@ def process_order_flow(user_id: str, message: str) -> str:
         del user_state[user_id]
         state = None
 
-    # If the user explicitly types "order" or "menu", (re)start the order flow.
+    # Start a new order flow if the user explicitly types "order" or "menu"
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -286,10 +289,10 @@ def process_order_flow(user_id: str, message: str) -> str:
                     if quantity <= 0:
                         return "Please enter a valid quantity (e.g., 1, 2, 3)."
                     state.data["quantity"] = quantity
-                    state.step = 3  # move directly to address step
-                    return f"You selected {found_dish} with {quantity} serving(s). Please provide your delivery address."
+                    state.step = 3  # Move to phone number step
+                    return f"You selected {found_dish} with {quantity} serving(s). Please provide your phone number for order updates."
                 else:
-                    state.step = 2  # ask for quantity
+                    state.step = 2  # Ask for quantity
                     return f"You selected {found_dish}. How many servings would you like?"
             else:
                 return "I couldn't identify the dish. Please type the dish name from our menu."
@@ -304,17 +307,59 @@ def process_order_flow(user_id: str, message: str) -> str:
                 return "Please enter a valid quantity (e.g., 1, 2, 3)."
             state.data["quantity"] = quantity
             state.step = 3
-            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Now, please provide your delivery address."
+            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Please provide your phone number for order updates."
 
-        # --- Step 3: Requesting Delivery Address ---
+        # --- Step 3: Requesting Phone Number ---
         if state.step == 3:
-            # Assume any text is a valid address
-            state.data["address"] = message
-            state.step = 4
-            return f"Thanks. Your delivery address is recorded as: {message}. Confirm order? (yes/no)"
+            phone_pattern = r'^\+?\d{10,15}$'
+            if re.match(phone_pattern, message.strip()):
+                state.data["phone_number"] = message.strip()
+                state.step = 4
+                return "Thank you. Please provide your delivery address. (Make sure it includes 'OJO LGA, Lagos')"
+            else:
+                return "Please enter a valid phone number (e.g., +234XXXXXXXXXX or 0XXXXXXXXXX)."
 
-        # --- Step 4: Order Confirmation & Finalization ---
+        # --- Step 4: Requesting Delivery Address with Local Govt Check ---
         if state.step == 4:
+            if "ojo lga, lagos" not in message.lower():
+                return "We only deliver to OJO LGA, Lagos. Please provide a valid delivery address that includes 'OJO LGA, Lagos'."
+            state.data["address"] = message
+            state.step = 5
+            return f"Thanks. Your delivery address is recorded as: {message}. Would you like to add any extras such as sides or drinks? (yes/no)"
+
+        # --- Step 5: Asking if They Want Extras ---
+        if state.step == 5:
+            if message.lower() in ["yes", "y"]:
+                state.step = 6
+                return "Please list the extras you would like to add (e.g., drinks, sides, etc.)."
+            elif message.lower() in ["no", "n"]:
+                state.data["extras"] = ""
+                state.step = 7
+                dish = state.data.get("dish", "")
+                quantity = state.data.get("quantity", 1)
+                phone = state.data.get("phone_number", "")
+                address = state.data.get("address", "")
+                summary = (f"Order Summary:\nDish: {dish}\nQuantity: {quantity}\n"
+                           f"Phone: {phone}\nAddress: {address}\nExtras: None\nConfirm order? (yes/no)")
+                return summary
+            else:
+                return "Please respond with 'yes' or 'no'. Would you like to add any extras to your order? (yes/no)"
+
+        # --- Step 6: Capturing Extras Details ---
+        if state.step == 6:
+            state.data["extras"] = message
+            state.step = 7
+            dish = state.data.get("dish", "")
+            quantity = state.data.get("quantity", 1)
+            phone = state.data.get("phone_number", "")
+            address = state.data.get("address", "")
+            extras = state.data.get("extras", "")
+            summary = (f"Order Summary:\nDish: {dish}\nQuantity: {quantity}\n"
+                       f"Phone: {phone}\nAddress: {address}\nExtras: {extras}\nConfirm order? (yes/no)")
+            return summary
+
+        # --- Step 7: Order Confirmation & Finalization ---
+        if state.step == 7:
             if message.lower() in ["yes", "y"]:
                 order_id = f"ORD-{int(time.time())}"
                 state.data["order_id"] = order_id
@@ -323,7 +368,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                 total_price = quantity * price_per_serving
                 state.data["price"] = str(total_price)
 
-                # Save the order asynchronously (including delivery_address)
+                # Save the order asynchronously (including delivery_address, phone, extras)
                 async def save_order():
                     async with async_session() as session:
                         order = Order(
@@ -347,7 +392,9 @@ def process_order_flow(user_id: str, message: str) -> str:
                         f"Dish: {order_details['dish']}\n"
                         f"Quantity: {order_details['quantity']}\n"
                         f"Total Price: {order_details['price']}\n"
+                        f"Phone: {state.data.get('phone_number', '')}\n"
                         f"Delivery Address: {order_details.get('address', 'Not Provided')}\n"
+                        f"Extras: {state.data.get('extras', 'None')}\n"
                         f"Status: Pending Payment"
                     )
                     await asyncio.to_thread(send_whatsapp_message, MANAGEMENT_WHATSAPP_NUMBER, message_body)
@@ -356,8 +403,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                     "dish": state.data["dish"],
                     "quantity": state.data["quantity"],
                     "price": state.data["price"],
-                    "address": state.data.get("address", ""),
-                    "status": "Pending Payment"
+                    "address": state.data.get("address", "")
                 }
                 asyncio.create_task(notify_management_order(order_details))
 
@@ -371,7 +417,8 @@ def process_order_flow(user_id: str, message: str) -> str:
                     payment_link = payment_data["data"]["authorization_url"]
                     return (f"Thank you for your order of {quantity} serving(s) of {dish_name}! "
                             f"Your Order ID is {order_id}.\nPlease complete payment here: {payment_link}\n"
-                            "You can track your order status using your Order ID.")
+                            "You can track your order status using your Order ID.\n"
+                            "Is there anything else you'd like to order?")
                 else:
                     return f"Your order has been placed with Order ID {order_id}, but we could not initialize payment. Please try again later."
             else:
@@ -520,7 +567,7 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
         if selected_dish:
             state = ConversationState()
             state.flow = "order"
-            # **** FIX: Set step to 2 since the dish is already selected ****
+            # Set step to 2 since the dish is already selected
             state.step = 2  
             state.data["dish"] = selected_dish
             state.update_last_active()