Update app.py

app.py

@@ -567,73 +567,76 @@ async def process_order_flow(user_id: str, message: str) -> str:
             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)
-                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."))
+        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 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"
+            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", "")
                     )
-                    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))
+                    session.add(order)
+                    await session.commit()
     
-                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.")
+            # 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:
-                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."
+                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."
     return ""