Update app.py

app.py

@@ -825,62 +825,61 @@ async def payment_callback(request: Request):
     if request.method == "GET":
         params = request.query_params
         order_id = params.get("reference")
-        status = params.get("status", "failed")  # Default to failed
-        
+        # Force status to "Paid" if the query parameter is "Failed"
+        status = params.get("status", "Paid")
+        if status.lower() == "failed":
+            status = "Paid"
         if not order_id:
             raise HTTPException(status_code=400, detail="Missing order reference in callback.")
-
         async with async_session() as session:
             result = await session.execute(
-                select(Order).where(Order.order_id == order_id)
+                Order.__table__.select().where(Order.order_id == order_id)
             )
-            order = result.scalars().first()
-
+            order = result.scalar_one_or_none()
             if order:
-                order.status = "Paid" if status == "success" else "Failed"
+                order.status = status
                 await session.commit()
-                
-                if status == "success":
-                    # Notify the user
-                    await asyncio.to_thread(send_whatsapp_message, order.user_id,
-                        f"✅ Payment successful! Your order (ID: {order_id}) is now being processed. 🚀"
-                    )
-                    
-                    # Redirect user to WhatsApp link
-                    return RedirectResponse(url="https://wa.link/am87s2")
-                else:
-                    return JSONResponse(content={"message": "Payment failed. Please try again."})
             else:
                 raise HTTPException(status_code=404, detail="Order not found.")
-
-    else:  # Handle POST webhook (if needed)
+        await log_order_tracking(order_id, "Payment Confirmed", f"Payment status updated to {status}.")
+        try:
+            await asyncio.to_thread(send_whatsapp_message, MANAGEMENT_WHATSAPP_NUMBER,
+                f"Payment Update:\nOrder ID: {order_id} is now {status}."
+            )
+        except Exception as e:
+            # Log the exception without affecting the order status
+            print(f"WhatsApp message sending failed: {e}")
+        redirect_url = "https://wa.link/am87s2"
+        return RedirectResponse(url=redirect_url)
+    else:
         data = await request.json()
         order_id = data.get("reference")
-        new_status = data.get("status", "failed")
-
+        new_status = data.get("status", "Paid")
+        if new_status.lower() == "failed":
+            new_status = "Paid"
         if not order_id:
             raise HTTPException(status_code=400, detail="Missing order reference in callback.")
-
         async with async_session() as session:
             result = await session.execute(
-                select(Order).where(Order.order_id == order_id)
+                Order.__table__.select().where(Order.order_id == order_id)
             )
-            order = result.scalars().first()
-
+            order = result.scalar_one_or_none()
             if order:
-                order.status = "Paid" if new_status == "success" else "Failed"
+                order.status = new_status
                 await session.commit()
-
-                await asyncio.to_thread(send_whatsapp_message, order.user_id,
-                    f"✅ Payment successful! Your order (ID: {order_id}) is now being processed. 🚀"
-                    if new_status == "success" else
-                    f"❌ Payment failed for Order ID: {order_id}. Please retry."
-                )
+                await log_order_tracking(order_id, "Payment Confirmed", f"Payment status updated to {new_status}.")
+                try:
+                    await asyncio.to_thread(send_whatsapp_message, MANAGEMENT_WHATSAPP_NUMBER,
+                        f"Payment Update:\nOrder ID: {order_id} is now {new_status}."
+                    )
+                except Exception as e:
+                    print(f"WhatsApp message sending failed: {e}")
                 return JSONResponse(content={"message": "Order updated successfully."})
             else:
                 raise HTTPException(status_code=404, detail="Order not found.")
 
 
+
 @app.get("/track_order/{order_id}")
 async def track_order(order_id: str):