Update app.py

app.py

@@ -106,9 +106,33 @@ menu_items = [
     {"name": "Jollof Rice", "description": "A spicy and flavorful rice dish", "price": 1500, "nutrition": "Calories: 300 kcal, Carbs: 50g, Protein: 10g, Fat: 5g"},
     {"name": "Fried Rice", "description": "A savory rice dish with vegetables and meat", "price": 1200, "nutrition": "Calories: 350 kcal, Carbs: 55g, Protein: 12g, Fat: 8g"},
     {"name": "Chicken Wings", "description": "Crispy fried chicken wings", "price": 2000, "nutrition": "Calories: 400 kcal, Carbs: 20g, Protein: 25g, Fat: 15g"},
-    {"name": "Egusi Soup", "description": "A rich and hearty soup made with melon seeds", "price": 1000, "nutrition": "Calories: 250 kcal, Carbs: 15g, Protein: 8g, Fat: 10g"}
+    {"name": "Egusi Soup", "description": "A rich and hearty soup made with melon seeds", "price": 1000, "nutrition": "Calories: 250 kcal, Carbs: 15g, Protein: 8g, Fat: 10g"},
+    {"name": "All Rice Except Native Rice", "description": "Any rice dish except native rice", "price": 1200, "nutrition": "Calories: 320 kcal, Carbs: 55g, Protein: 8g, Fat: 6g"},
+    {"name": "Native Rice", "description": "Traditional native-style rice", "price": 1500, "nutrition": "Calories: 350 kcal, Carbs: 60g, Protein: 10g, Fat: 7g"},
+    {"name": "Spaghetti Jollof", "description": "Jollof-style spaghetti dish", "price": 1200, "nutrition": "Calories: 400 kcal, Carbs: 65g, Protein: 10g, Fat: 8g"},
+    {"name": "Macaroni Jollof", "description": "Jollof-style macaroni dish", "price": 1200, "nutrition": "Calories: 380 kcal, Carbs: 60g, Protein: 9g, Fat: 7g"},
+    {"name": "White Rice with Vegetable Sauce and Chicken", "description": "White rice served with vegetable sauce and chicken", "price": 3700, "nutrition": "Calories: 450 kcal, Carbs: 60g, Protein: 15g, Fat: 10g"},
+    {"name": "Only Vegetable Sauce with Chicken", "description": "Vegetable sauce with chicken, no rice", "price": 2500, "nutrition": "Calories: 300 kcal, Carbs: 20g, Protein: 15g, Fat: 10g"},
+    {"name": "Chicken Drumstick", "description": "Fried or grilled chicken drumstick", "price": 2500, "nutrition": "Calories: 350 kcal, Carbs: 5g, Protein: 30g, Fat: 15g"},
+    {"name": "Chicken Wings", "description": "Crispy fried chicken wings", "price": 3960, "nutrition": "Calories: 450 kcal, Carbs: 20g, Protein: 30g, Fat: 20g"},
+    {"name": "Fried Chicken", "description": "Crispy deep-fried chicken", "price": 4140, "nutrition": "Calories: 500 kcal, Carbs: 15g, Protein: 35g, Fat: 25g"},
+    {"name": "Fried Turkey", "description": "Crispy deep-fried turkey", "price": 4000, "nutrition": "Calories: 480 kcal, Carbs: 10g, Protein: 40g, Fat: 20g"},
+    {"name": "Gizzard", "description": "Fried or grilled gizzard", "price": 3000, "nutrition": "Calories: 200 kcal, Carbs: 5g, Protein: 20g, Fat: 8g"},
+    {"name": "Fish", "description": "Fried or grilled fish", "price": 2500, "nutrition": "Calories: 250 kcal, Carbs: 5g, Protein: 25g, Fat: 10g"},
+    {"name": "Beef", "description": "Spicy fried or grilled beef", "price": 1200, "nutrition": "Calories: 300 kcal, Carbs: 2g, Protein: 28g, Fat: 15g"},
+    {"name": "Pepper Chicken", "description": "Spicy peppered chicken", "price": 1500, "nutrition": "Calories: 400 kcal, Carbs: 10g, Protein: 35g, Fat: 18g"},
+    {"name": "Pepper Chicken Big", "description": "Larger portion of spicy peppered chicken", "price": 2500, "nutrition": "Calories: 600 kcal, Carbs: 15g, Protein: 50g, Fat: 25g"},
+    {"name": "Salad", "description": "Fresh vegetable salad", "price": 800, "nutrition": "Calories: 100 kcal, Carbs: 15g, Protein: 3g, Fat: 5g"},
+    {"name": "Egg and Yam", "description": "Boiled yam served with eggs", "price": 1000, "nutrition": "Calories: 300 kcal, Carbs: 50g, Protein: 10g, Fat: 5g"},
+    {"name": "Moi Moi", "description": "Steamed bean pudding", "price": 1000, "nutrition": "Calories: 250 kcal, Carbs: 30g, Protein: 12g, Fat: 8g"},
+    {"name": "Plantain", "description": "Fried or boiled ripe plantain", "price": 1000, "nutrition": "Calories: 200 kcal, Carbs: 50g, Protein: 2g, Fat: 1g"},
+    {"name": "Soup with Goat Meat and Semo", "description": "Rich soup with goat meat served with semo", "price": 4600, "nutrition": "Calories: 500 kcal, Carbs: 60g, Protein: 30g, Fat: 15g"},
+    {"name": "Soup with Chicken and Semo", "description": "Soup served with chicken and semo", "price": 500, "nutrition": "Calories: 450 kcal, Carbs: 55g, Protein: 28g, Fat: 12g"},
+    {"name": "Extra Semo", "description": "Additional portion of semo", "price": 500, "nutrition": "Calories: 200 kcal, Carbs: 45g, Protein: 5g, Fat: 1g"},
+    {"name": "Banger with Catfish", "description": "Traditional dish with catfish", "price": 5000, "nutrition": "Calories: 600 kcal, Carbs: 50g, Protein: 35g, Fat: 15g"}
 ]
 
+
 class ConversationState:
     def __init__(self):
         self.flow = None
@@ -384,13 +408,19 @@ def match_dishes(user_input: str, threshold: int = 70) -> list:
                 matched_dishes.append(dish_name)
     return list(set(matched_dishes))
 
+
 async def process_order_flow(user_id: str, message: str) -> str:
+    """
+    A unified approach to parse dish(es), quantity, phone, and address
+    whether the user provides them all at once or in multiple steps.
+    """
     state = user_state.get(user_id)
     if state and state.is_expired():
         state.reset()
         del user_state[user_id]
         state = None
 
+    # 1) If user says "menu" or "order", initialize the flow
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -401,6 +431,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
             return "Sure! What dish would you like to order?"
         return ""
 
+    # If user says "order" but we have no state
     if not state and "order" in message.lower():
         state = ConversationState()
         state.flow = "order"
@@ -409,236 +440,339 @@ async def process_order_flow(user_id: str, message: str) -> str:
         user_state[user_id] = state
         return "Sure! What dish would you like to order?"
 
-    # Use fuzzy matching to detect a dish even with typos
+    # 2) If we aren't in the order flow yet, try to detect dish(es)
     if not state or state.flow != "order":
-        found_dish = match_dish(message)
-        if found_dish:
-            state = ConversationState()
-            state.flow = "order"
-            state.data["dish"] = found_dish
-            state.update_last_active()
-            user_state[user_id] = state
-            numbers = re.findall(r'\d+', message)
-            if numbers:
-                quantity = int(numbers[0])
-                if quantity <= 0:
-                    return "Please enter a valid quantity (e.g., 1, 2, 3)."
-                state.data["quantity"] = quantity
-                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()
-                    address = message[address_start:].strip()
-                    address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
-                if phone_match and address:
-                    state.data["phone_number"] = phone_number
-                    state.data["address"] = address
-                    asyncio.create_task(update_user_profile(user_id, phone_number, 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 extras (yes/no)?")
-                elif phone_match:
-                    state.data["phone_number"] = phone_match.group(1)
-                    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'.")
+        matched = match_dishes(message)
+        if matched:
+            # Multiple candidate dishes
+            if len(matched) > 1:
+                state = ConversationState()
+                state.flow = "order"
+                state.update_last_active()
+                user_state[user_id] = state
+                state.data["candidate_dishes"] = matched
+                dish_options = ", ".join(matched)
+                return (f"We found multiple dishes in your request: {dish_options}. "
+                        "Please specify which one you'd like to order or type 'both' if you'd like all.")
             else:
-                state.step = 2
-                return f"You selected {found_dish}. How many servings would you like?"
-                
-    # If state exists and we're already in order flow:
-    if state and state.flow == "order":
-        state.update_last_active()
-        if state.step == 1:
-            # Use fuzzy matching on the message in case of typos.
-            found_dish = match_dish(message)
-            numbers = re.findall(r'\d+', message)
-            if found_dish:
+                # Single dish
+                found_dish = matched[0]
+                state = ConversationState()
+                state.flow = "order"
+                state.update_last_active()
+                user_state[user_id] = state
                 state.data["dish"] = found_dish
-                if numbers:
-                    quantity = int(numbers[0])
-                    if quantity <= 0:
-                        return "Please enter a valid quantity (e.g., 1, 2, 3)."
-                    state.data["quantity"] = quantity
+                # Attempt to parse quantity, phone, address if user typed them all
+                single_dish_parse = _parse_single_dish_line(message, found_dish)
+                if single_dish_parse["quantity"]:
+                    state.data["quantity"] = single_dish_parse["quantity"]
                     state.step = 3
-                    return (f"You selected {found_dish} with {quantity} serving(s). "
-                            "Please provide your phone number and delivery address.")
                 else:
+                    # If no quantity found, we still need quantity
                     state.step = 2
+
+                if single_dish_parse["phone"]:
+                    state.data["phone_number"] = single_dish_parse["phone"]
+                if single_dish_parse["address"]:
+                    state.data["address"] = single_dish_parse["address"]
+
+                # Now see how much info we have:
+                if state.step == 2 and not state.data.get("quantity"):
+                    # We must ask for quantity
                     return f"You selected {found_dish}. How many servings would you like?"
+                elif state.step == 3:
+                    # We have a quantity. Check if we also have phone and address
+                    if state.data.get("phone_number") and state.data.get("address"):
+                        # We have everything needed to skip to step 5
+                        shipping_cost = calculate_shipping_cost(state.data["address"])
+                        state.data["shipping_cost"] = shipping_cost
+                        state.step = 5
+                        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)?")
+                    elif state.data.get("phone_number") and not state.data.get("address"):
+                        return "Thank you. Please provide your delivery address."
+                    else:
+                        return "Please provide your phone number and address."
+        else:
+            # No dish matched
+            return "I couldn't identify the dish. Please type the dish name from our menu."
+
+    # 3) If we have candidate dishes and user needs to clarify
+    if state and state.flow == "order" and "candidate_dishes" in state.data:
+        # If user typed "both" => they want all candidate dishes
+        if message.strip().lower() in ["both", "all"]:
+            state.data["dishes"] = state.data["candidate_dishes"]
+            del state.data["candidate_dishes"]
+            state.step = 2  # We'll parse "2 for Jollof Rice and 3 for Fried Rice"
+            dishes_str = ", ".join(state.data["dishes"])
+            return (f"You have selected: {dishes_str}. How many servings of each would you like? "
+                    "(For example, '2 for Jollof Rice and 3 for Fried Rice')")
+        else:
+            # Maybe the user typed a single dish out of the candidates
+            for dish in state.data["candidate_dishes"]:
+                if dish.lower() in message.lower():
+                    state.data["dish"] = dish
+                    del state.data["candidate_dishes"]
+                    state.step = 2
+                    return f"You selected {dish}. How many servings would you like?"
+            # If still unclear
+            dish_options = ", ".join(state.data["candidate_dishes"])
+            return (f"Please specify which one you'd like to order from: {dish_options} "
+                    "(or type 'both' if you'd like to order all).")
+
+    # 4) If step == 2 for multiple dishes => parse "2 for Jollof Rice and 3 for Fried Rice"
+    if state and state.flow == "order" and state.step == 2:
+        if "dishes" in state.data and len(state.data["dishes"]) > 1:
+            pairs = re.findall(r'(\d+)\s*for\s*([a-zA-Z\s]+)', message, flags=re.IGNORECASE)
+            if not pairs:
+                return ("I'm sorry, I didn't understand the quantity details. "
+                        "Please specify like '2 for Jollof Rice and 3 for Fried Rice'.")
+            order_quantities = {}
+            for quantity, dish_text in pairs:
+                dish_text = dish_text.strip().lower()
+                for candidate in state.data["dishes"]:
+                    if candidate.lower() in dish_text or dish_text in candidate.lower():
+                        order_quantities[candidate] = int(quantity)
+            if order_quantities:
+                state.data["orders"] = order_quantities
+                state.step = 3
+                summary = "\n".join([f"{q} serving(s) of {d}" for d, q in order_quantities.items()])
+                return (f"Got it. You have ordered:\n{summary}\n"
+                        "Please provide your phone number and delivery address.")
             else:
-                return "I couldn't identify the dish. Please type the dish name from our menu."
-    
-        if state.step == 2:
-            numbers = re.findall(r'\d+', message)
-            if not numbers:
-                return "Please enter a valid number for the quantity (e.g., 1, 2, 3)."
-            quantity = int(numbers[0])
-            if quantity <= 0:
-                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 and delivery address."
-    
-        if 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()
-                address = message[address_start:].strip()
-                address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
-            if phone_match and address:
-                state.data["phone_number"] = phone_number
-                state.data["address"] = address
-                asyncio.create_task(update_user_profile(user_id, phone_number, 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 extras (yes/no)?")
-            elif phone_match:
-                state.data["phone_number"] = phone_match.group(1)
-                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'.")
-    
-        # Steps 4, 5, 6, and 7 remain unchanged.
-        if state.step == 4:
-            state.data["address"] = message
-            asyncio.create_task(update_user_profile(user_id, address=message))
-            shipping_cost = calculate_shipping_cost(message)
-            state.data["shipping_cost"] = shipping_cost
-            state.step = 5
-            return (f"Thanks. Your delivery address is recorded as: {message}.\n"
-                    f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
-    
-        if state.step == 5:
-            if message.lower() in ["yes", "y"]:
-                state.step = 6
-                return "Please list the extras you'd like (e.g., drinks, sides)."
-            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", "")
-                shipping_cost = state.data.get("shipping_cost", 0)
-                price_per_serving = 1500
-                total_price = (quantity * price_per_serving) + shipping_cost
-                summary = (f"Order Summary:\nDish: {dish}\nQuantity: {quantity}\n"
-                           f"Phone: {phone}\nAddress: {address}\n"
-                           f"Shipping Cost: N{shipping_cost}\n"
-                           f"Total Price: N{total_price}\n"
-                           f"Extras: None\nConfirm order? (yes/no)")
-                return summary
+                return ("I'm sorry, I couldn't match those dishes. "
+                        "Please try something like '2 for Jollof Rice and 3 for Fried Rice'.")
+
+        # Single-dish scenario at step 2 => user typed just a quantity
+        numbers = re.findall(r'\d+', message)
+        if not numbers:
+            return "Please enter a valid number for the quantity (e.g., 1, 2, 3)."
+        quantity = int(numbers[0])
+        if quantity <= 0:
+            return "Please enter a valid quantity (e.g., 1, 2, 3)."
+        state.data["quantity"] = quantity
+        state.step = 3
+        dish = state.data.get("dish", "")
+        return (f"Got it. {quantity} serving(s) of {dish}. "
+                "Please provide your phone number and delivery address.")
+
+    # 5) Step == 3 => parse phone & address for single or multiple dishes
+    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()
+            address = message[address_start:].strip()
+            address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+            state.data["phone_number"] = phone_number
+            state.data["address"] = address
+            asyncio.create_task(update_user_profile(user_id, phone_number, address))
+        else:
+            # Maybe the user typed an address only, or partial info
+            # If the phone was previously stored, we just store the address
+            if "phone_number" in state.data:
+                state.data["address"] = message.strip()
             else:
-                return "Please respond with 'yes' or 'no' regarding extras."
+                # If no phone number found yet, we need it
+                return ("Please provide both your phone number and address. "
+                        "For example: '09162409591, 1, Iyana Isashi, Isashi, Lagos'.")
+
+        if "address" not in state.data:
+            # If we only found phone but no address, ask for address
+            return "Thank you. Please provide your delivery address."
+
+        # If we have phone + address, move to step 5 => ask extras
+        shipping_cost = calculate_shipping_cost(state.data["address"])
+        state.data["shipping_cost"] = shipping_cost
+        state.step = 5
+        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)?")
     
-        if state.step == 6:
-            state.data["extras"] = message
+        # ... existing code above ...
+
+    # Step 5: Ask user about extras
+    if state and state.flow == "order" and state.step == 5:
+        # If user wants extras
+        if message.lower() in ["yes", "y"]:
+            state.step = 6
+            return "Please list the extras you'd like (e.g., drinks, sides)."
+
+        # If user doesn't want extras
+        elif message.lower() in ["no", "n"]:
+            state.data["extras"] = ""
             state.step = 7
+            # Summarize the order so far
+            # If you handled multiple dishes, you'd need to show all. 
+            # For single dish, just show dish + quantity:
             dish = state.data.get("dish", "")
             quantity = state.data.get("quantity", 1)
             phone = state.data.get("phone_number", "")
             address = state.data.get("address", "")
             shipping_cost = state.data.get("shipping_cost", 0)
-            extras = state.data.get("extras", "")
+            extras = "None"
+            
+            # If you used state.data["orders"] for multiple dishes, 
+            # you'd build a summary from that dictionary.
+            
             price_per_serving = 1500
             total_price = (quantity * price_per_serving) + shipping_cost
-            summary = (f"Order Summary:\nDish: {dish}\nQuantity: {quantity}\n"
-                       f"Phone: {phone}\nAddress: {address}\n"
+            summary = (f"Order Summary:\n"
+                       f"Dish: {dish}\n"
+                       f"Quantity: {quantity}\n"
+                       f"Phone: {phone}\n"
+                       f"Address: {address}\n"
                        f"Shipping Cost: N{shipping_cost}\n"
                        f"Total Price: N{total_price}\n"
-                       f"Extras: {extras}\nConfirm order? (yes/no)")
+                       f"Extras: {extras}\n"
+                       f"Confirm order? (yes/no)")
             return summary
+
+        else:
+            # If user typed something else at step 5
+            return "Please respond with 'yes' or 'no' regarding extras."
+
+    # Step 6: If user typed "yes" for extras, we prompt them for a list
+    if state and state.flow == "order" and state.step == 6:
+        # The user has just listed extras
+        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", "")
+        shipping_cost = state.data.get("shipping_cost", 0)
+        extras = state.data.get("extras", "None")
+
+        price_per_serving = 1500
+        total_price = (quantity * price_per_serving) + shipping_cost
+        summary = (f"Order Summary:\n"
+                   f"Dish: {dish}\n"
+                   f"Quantity: {quantity}\n"
+                   f"Phone: {phone}\n"
+                   f"Address: {address}\n"
+                   f"Shipping Cost: N{shipping_cost}\n"
+                   f"Total Price: N{total_price}\n"
+                   f"Extras: {extras}\n"
+                   f"Confirm order? (yes/no)")
+        return summary
+
     
-        if state.step == 7:
-            if message.lower() in ["yes", "y"]:
-                order_id = f"ORD-{int(time.time())}"
-                state.data["order_id"] = order_id
-                price_per_serving = 1500
-                quantity = state.data.get("quantity", 1)
-                total_price = quantity * price_per_serving  # Removed shipping cost
-                state.data["price"] = str(total_price)
-        
-                async def save_order():
-                    async with async_session() as session:
-                        order = Order(
-                            order_id=order_id,
-                            user_id=user_id,
-                            dish=state.data["dish"],
-                            quantity=str(quantity),
-                            price=str(total_price),
-                            status="Pending Payment",
-                            delivery_address=state.data.get("address", "")
-                        )
-                        session.add(order)
-                        await session.commit()
-        
-                # Await the save_order task to ensure the order is committed before proceeding.
-                await save_order()
-        
-                asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
-        
-                async def notify_management_order(order_details: dict):
-                    message_body = (
-                        f"New Order Received:\n"
-                        f"Order ID: {order_details['order_id']}\n"
-                        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)
-        
-                order_details = {
-                    "order_id": order_id,
-                    "dish": state.data["dish"],
-                    "quantity": state.data["quantity"],
-                    "price": state.data["price"],
-                    "address": state.data.get("address", "")
-                }
-                asyncio.create_task(notify_management_order(order_details))
-        
-                email = "customer@example.com"
-                payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
-                dish_name = state.data.get("dish", "")
-                state.reset()
-                if user_id in user_state:
-                    del user_state[user_id]
-                if payment_data.get("status"):
-                    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.\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:
-                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."
+    # 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
+        price_per_serving = 1500
+        quantity = state.data.get("quantity", 1)
+        shipping_cost = state.data.get("shipping_cost", 0)
+        total_price = (quantity * price_per_serving) + shipping_cost
+        state.data["price"] = str(total_price)
+
+        async def save_order():
+            async with async_session() as session:
+                order = Order(
+                    order_id=order_id,
+                    user_id=user_id,
+                    dish=state.data["dish"],
+                    quantity=str(quantity),
+                    price=str(total_price),
+                    status="Pending Payment",
+                    delivery_address=state.data.get("address", "")
+                )
+                session.add(order)
+                await session.commit()
+        asyncio.create_task(save_order())
+        asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
+
+        async def notify_management_order(order_details: dict):
+            message_body = (
+                f"New Order Received:\n"
+                f"Order ID: {order_details['order_id']}\n"
+                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)
+        order_details = {
+            "order_id": order_id,
+            "dish": state.data["dish"],
+            "quantity": state.data["quantity"],
+            "price": state.data["price"],
+            "address": state.data.get("address", "")
+        }
+        asyncio.create_task(notify_management_order(order_details))
+
+        email = "customer@example.com"  # or extract the email from the user's profile if available
+        # create_paystack_payment_link returns a dict with a key "status" and the link under "data.authorization_url"
+        payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
+        dish_name = state.data.get("dish", "")
+        # Clean up state
+        state.reset()
+        if user_id in user_state:
+            del user_state[user_id]
+        if payment_data.get("status"):
+            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}.\n\n"
+                    "Please complete your payment using one of the following options:\n"
+                    f"1. Pay online via our Paystack link: {payment_link}\n"
+                    "2. Alternatively, you can make a bank transfer to the following account:\n"
+                    "   Account Number: 1433042821\n"
+                    "   Bank: Access Bank\n"
+                    "   Account Name: Angelo Food Court 2\n\n"
+                    "If you choose the bank transfer option, please send a screenshot of your payment confirmation to this chatbot.\n\n"
+                    "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 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 "
+                    "and send your payment screenshot to this chatbot.")
+
+    else:
+        state.reset()
+        if user_id in user_state:
+            del user_state[user_id]
+
+    # Final fallback
     return ""
 
+
+        
+
+def _parse_single_dish_line(message: str, dish_name: str) -> dict:
+   
+    result = {"quantity": None, "phone": None, "address": None}
+
+    # 1) Parse quantity
+    numbers = re.findall(r'\d+', message)
+    if numbers:
+        # We'll assume the first numeric is quantity if no "for" pattern is used
+        result["quantity"] = int(numbers[0])
+
+    # 2) Parse phone
+    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()
+        address = message[address_start:].strip()
+        address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+        result["phone"] = phone_number
+        if address:
+            result["address"] = address
+
+    return result
+
     
 async def get_or_create_user_profile(user_id: str, phone_number: str = None) -> UserProfile:
     async with async_session() as session: