Update app.py

app.py

@@ -279,36 +279,6 @@ def process_order_flow(user_id: str, message: str) -> str:
     """
     Implements an FSM-based order flow with shipping cost calculation.
     """
-
-     # Check if the message contains an order ID (e.g., "ord-123456789")
-    order_id_match = re.search(r"ord-\d+", message.lower())
-    if order_id_match:
-        order_id = order_id_match.group(0)
-        # Fetch order tracking details
-        async def fetch_order_tracking():
-            async with async_session() as session:
-                result = await session.execute(
-                    select(OrderTracking)
-                    .where(OrderTracking.order_id == order_id)
-                    .order_by(OrderTracking.timestamp)
-                )
-                tracking_updates = result.scalars().all()
-                if tracking_updates:
-                    return tracking_updates
-                return None
-
-        tracking_updates = await fetch_order_tracking()
-        if tracking_updates:
-            response = "📦 *Order Tracking Details:*\n"
-            for update in tracking_updates:
-                response += (
-                    f"• *Status:* {update.status}\n"
-                    f"• *Message:* {update.message or 'No additional details'}\n"
-                    f"• *Timestamp:* {update.timestamp}\n\n"
-                )
-            return response
-        else:
-            return f"⚠️ Sorry, we couldn't find tracking details for order ID: {order_id}."
             
     # Retrieve or initialize conversation state
     state = user_state.get(user_id)
@@ -493,6 +463,37 @@ 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."))
 
+                        
+             # Check if the message contains an order ID (e.g., "ord-123456789")
+            order_id_match = re.search(r"ord-\d+", message.lower())
+            if order_id_match:
+                order_id = order_id_match.group(0)
+                # Fetch order tracking details
+                async def fetch_order_tracking():
+                    async with async_session() as session:
+                        result = await session.execute(
+                            select(OrderTracking)
+                            .where(OrderTracking.order_id == order_id)
+                            .order_by(OrderTracking.timestamp)
+                        )
+                        tracking_updates = result.scalars().all()
+                        if tracking_updates:
+                            return tracking_updates
+                        return None
+        
+                tracking_updates = await fetch_order_tracking()
+                if tracking_updates:
+                    response = "📦 *Order Tracking Details:*\n"
+                    for update in tracking_updates:
+                        response += (
+                            f"• *Status:* {update.status}\n"
+                            f"• *Message:* {update.message or 'No additional details'}\n"
+                            f"• *Timestamp:* {update.timestamp}\n\n"
+                        )
+                    return response
+                else:
+                    return f"⚠️ Sorry, we couldn't find tracking details for order ID: {order_id}."
+
                 # Notify management of the new order via WhatsApp
                 async def notify_management_order(order_details: dict):
                     message_body = (