Update app.py

app.py

@@ -329,7 +329,7 @@ def process_order_flow(user_id: str, message: str) -> str:
             state.data["quantity"] = quantity
             state.update_last_active()
             user_state[user_id] = state
-            return f"You selected {found_dish} with {quantity} serving(s). Please provide your phone number for order updates."
+            return f"You selected {found_dish} with {quantity} serving(s). Please provide your phone number and delivery address."
 
     if state and state.flow == "order":
         state.update_last_active()
@@ -350,7 +350,7 @@ 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  # Move to phone number step
-                    return f"You selected {found_dish} with {quantity} serving(s). Please provide your phone number for order updates."
+                    return f"You selected {found_dish} with {quantity} serving(s). Please provide your phone number and delivery address."
                 else:
                     state.step = 2  # Ask for quantity
                     return f"You selected {found_dish}. How many servings would you like?"
@@ -367,17 +367,37 @@ 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')}. Please provide your phone number for order updates."
+            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Please provide your phone number and delivery address."
 
-        # --- Step 3: Requesting Phone Number ---
+        # --- Step 3: Requesting Phone Number and Address ---
         if state.step == 3:
-            phone_pattern = r'^\+?\d{10,15}$'
-            if re.match(phone_pattern, message.strip()):
-                state.data["phone_number"] = message.strip()
-                state.step = 4
+            # Regular expression to extract phone number and address
+            phone_pattern = r'(\+?\d{10,15})'
+            address_pattern = r'address:\s*(.+)'
+            
+            phone_match = re.search(phone_pattern, message)
+            address_match = re.search(address_pattern, message, re.IGNORECASE)
+            
+            if phone_match and address_match:
+                phone_number = phone_match.group(1)
+                address = address_match.group(1)
+                state.data["phone_number"] = phone_number
+                state.data["address"] = address
+                # Calculate shipping cost based on the address
+                shipping_cost = calculate_shipping_cost(address)
+                state.data["shipping_cost"] = shipping_cost
+                state.step = 5
+                return (f"Thanks. Your phone number is recorded as: {phone_number}.\n"
+                        f"Your delivery address is: {address}.\n"
+                        f"Your delivery cost is N{shipping_cost}. Would you like to add any extras such as sides or drinks? (yes/no)")
+            elif phone_match:
+                state.data["phone_number"] = phone_match.group(1)
                 return "Thank you. Please provide your delivery address."
+            elif address_match:
+                state.data["address"] = address_match.group(1)
+                return "Thank you. Please provide your phone number."
             else:
-                return "Please enter a valid phone number (e.g., +234XXXXXXXXXX or 0XXXXXXXXXX)."
+                return "Please provide both your phone number and delivery address. For example: 'Phone: 08123456789, Address: 123 Main St, Lagos'."
 
         # --- Step 4: Requesting Delivery Address ---
         if state.step == 4:
@@ -463,9 +483,6 @@ def process_order_flow(user_id: str, message: str) -> str:
                 # Record the initial tracking update: Order Placed
                 asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
 
-                        
-          
-
                 # Notify management of the new order via WhatsApp
                 async def notify_management_order(order_details: dict):
                     message_body = (