Update app.py

app.py

@@ -510,55 +510,56 @@ async def process_order_flow(user_id: str, message: str) -> str:
 
     # 2) If we are not already in the order flow, detect dish(es) from the message.
     if not state or state.flow != "order":
-        matched = match_dishes(message)
-        if matched:
-            if len(matched) == 1:
-                # Single dish: store in state.data["dish"]
-                found_dish = matched[0]
-                state = ConversationState()
-                state.flow = "order"
-                state.update_last_active()
-                user_state[user_id] = state
-                state.data["dish"] = found_dish
-                # Try to parse quantity, phone, address from the same message.
-                single_parse = _parse_single_dish_line(message, found_dish)
-                if single_parse["quantity"]:
-                    state.data["quantity"] = single_parse["quantity"]
-                    state.step = 3
-                else:
-                    state.step = 2
-                if single_parse["phone"]:
-                    state.data["phone_number"] = single_parse["phone"]
-                if single_parse["address"]:
-                    state.data["address"] = single_parse["address"]
-                if state.step == 2 and not state.data.get("quantity"):
-                    return f"You selected {found_dish}. How many servings would you like?"
-                elif state.step == 3:
-                    if state.data.get("phone_number") and state.data.get("address"):
-                        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."
+    matched = match_dishes(message)
+    if matched:
+        if len(matched) == 1:
+            # Single dish order
+            found_dish = matched[0]
+            state = ConversationState()
+            state.flow = "order"
+            state.update_last_active()
+            user_state[user_id] = state
+            state.data["dish"] = found_dish
+            # Try to parse quantity, phone, address from the same message.
+            single_parse = _parse_single_dish_line(message, found_dish)
+            if single_parse["quantity"]:
+                state.data["quantity"] = single_parse["quantity"]
+                state.step = 3
             else:
-                # Multiple dishes detected—allow unlimited dishes.
-                state = ConversationState()
-                state.flow = "order"
-                state.update_last_active()
-                user_state[user_id] = state
-                state.data["dishes"] = matched  # Store all matched dishes
                 state.step = 2
-                dish_options = ", ".join(matched)
-                return (f"You have selected the following dishes: {dish_options}.\n"
-                        "How many servings of each would you like? "
-                        "For example: '2 for Jollof Rice, 3 for Chicken Wings, 1 for Fish'")
+            if single_parse["phone"]:
+                state.data["phone_number"] = single_parse["phone"]
+            if single_parse["address"]:
+                state.data["address"] = single_parse["address"]
+            if state.step == 2 and not state.data.get("quantity"):
+                return f"You selected {found_dish}. How many servings would you like?"
+            elif state.step == 3:
+                if state.data.get("phone_number") and state.data.get("address"):
+                    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:
-            return "I couldn't identify the dish. Please type the dish name from our menu."
+            # Multiple dishes detected – support unlimited dishes.
+            state = ConversationState()
+            state.flow = "order"
+            state.update_last_active()
+            user_state[user_id] = state
+            state.data["dishes"] = matched  # Store all matched dishes
+            state.step = 2
+            dish_options = ", ".join(matched)
+            return (f"You have selected the following dishes: {dish_options}.\n"
+                    "How many servings of each would you like? "
+                    "For example: '2 for Jollof Rice, 3 for Chicken, 1 for Fish'")
+    else:
+        return "I couldn't identify the dish. Please type the dish name from our menu."
+
 
     # 3) If state exists and we're at step 2: parse quantity details.
     if state and state.flow == "order" and state.step == 2:
@@ -692,68 +693,68 @@ async def process_order_flow(user_id: str, message: str) -> str:
 
     # 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
-            # Handle both single-dish and multi-dish orders:
-            if "orders" in state.data:
-                total_price = 0
-                for dish, qty in state.data["orders"].items():
-                    total_price += get_dish_price(dish) * qty
-                # Add shipping cost once.
-                total_price += state.data.get("shipping_cost", 0)
-                dish_summary = ", ".join(state.data["orders"].keys())
-                quantity_total = sum(state.data["orders"].values())
-            else:
-                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():
-                async with async_session() as session:
-                    order = Order(
-                        order_id=order_id,
-                        user_id=user_id,
-                        dish=dish_summary,
-                        quantity=str(quantity_total),
-                        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."))
-
-            email_for_paystack = "customer@example.com"  # Replace with actual email if available
-            payment_data = create_paystack_payment_link(email_for_paystack, total_price * 100, order_id)
-            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_total} serving(s) of {dish_summary}! "
-                        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.")
+    if message.lower() in ["yes", "y"]:
+        order_id = f"ORD-{int(time.time())}"
+        state.data["order_id"] = order_id
+        # Calculate total price differently for multi-dish orders:
+        if "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)
+            dish_summary = ", ".join(state.data["orders"].keys())
+            quantity_total = sum(state.data["orders"].values())
         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."
+            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():
+            async with async_session() as session:
+                order = Order(
+                    order_id=order_id,
+                    user_id=user_id,
+                    dish=dish_summary,
+                    quantity=str(quantity_total),
+                    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."))
+
+        # Email notification and payment link code here (omitted for brevity)
+        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:
+            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_total} serving(s) of {dish_summary}! "
+                    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.")
+    elif message.lower() in ["no", "n"]:
+        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."
 
     # Final fallback
     return ""