Update app.py

app.py

@@ -303,6 +303,8 @@ async def update_user_profile(user_id: str, phone_number: str = None, address: s
         await session.commit()
         return profile
 
+# ... (rest of your imports and setup)
+
 def process_order_flow(user_id: str, message: str) -> str:
     """
     Implements an FSM-based order flow with shipping cost calculation.
@@ -335,7 +337,7 @@ def process_order_flow(user_id: str, message: str) -> str:
         user_state[user_id] = state
         return "Sure! What dish would you like to order?"
 
-    # --- New Logic: Parse Dish and Quantity in a Single Message ---
+    # --- New Logic: Parse Dish, Quantity, Phone Number, and Address in a Single Message ---
     if not state or state.flow != "order":
         # Check if the message contains a dish and quantity
         dish_candidates = [item["name"] for item in menu_items]
@@ -357,7 +359,38 @@ 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 and delivery address."
+
+            # Extract phone number and address from the message
+            phone_pattern = r'(\+?\d{10,15})'
+            phone_match = re.search(phone_pattern, message)
+            address = None
+            if phone_match:
+                phone_number = phone_match.group(1)
+                # Assume the address starts after the phone number
+                address_start = phone_match.end()
+                address = message[address_start:].strip()
+                # Remove any leading/trailing commas or spaces
+                address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+            
+            if phone_match and address:
+                state.data["phone_number"] = phone_number
+                state.data["address"] = address
+                # Save phone number and address to the user's profile
+                asyncio.create_task(update_user_profile(user_id, phone_number, 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)
+                # Save phone number to the user's profile
+                asyncio.create_task(update_user_profile(user_id, phone_number))
+                return "Thank you. Please provide your delivery address."
+            else:
+                return "Please provide both your phone number and delivery address. For example: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
 
     if state and state.flow == "order":
         state.update_last_active()
@@ -563,6 +596,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                 return "Order canceled. Let me know if you'd like to try again."
 
     return ""
+    
 # --- User Profile Functions ---
 async def get_or_create_user_profile(user_id: str, phone_number: str = None) -> UserProfile:
     async with async_session() as session: