Update backend with high-quality catalog and fixes

app/api/orders.py

@@ -129,9 +129,10 @@ def checkout(
     )
     db.add(payment)
     
-    # 6. Clear Cart
-    db.query(CartItem).filter(CartItem.cart_id == cart.id).delete()
-    cart.coupon_id = None
+    # 6. Clear Cart (Conditional)
+    if request.clear_cart:
+        db.query(CartItem).filter(CartItem.cart_id == cart.id).delete()
+        cart.coupon_id = None
     
     db.commit()
     # Eagerly load the order with all needed relations for the response
@@ -350,7 +351,8 @@ def upload_payment_receipt(
     order_id: int,
     file: UploadFile = File(...),
     current_user_id: Optional[int] = Depends(get_optional_current_user),
-    db: Session = Depends(get_db)
+    db: Session = Depends(get_db),
+    x_cart_id: Optional[str] = Header(None)
 ):
     if current_user_id:
         order = db.query(Order).filter(Order.id == order_id, Order.user_id == current_user_id).first()
@@ -383,6 +385,16 @@ def upload_payment_receipt(
     payment.receipt_url = receipt_url
     payment.status = PaymentStatus.PENDING # Awaiting admin approval
     
+    # 5. Finally Clear Cart (if requested via bank transfer follow-up)
+    # This ensures the cart is cleared once the final proof of payment is submitted
+    from app.api.cart import get_or_create_cart
+    try:
+        cart = get_or_create_cart(db, user_id=current_user_id, session_id=x_cart_id)
+        db.query(CartItem).filter(CartItem.cart_id == cart.id).delete()
+        cart.coupon_id = None
+    except:
+        pass # Cart might already be empty or not found
+
     db.commit()
     
     return {

app/schemas/order.py

@@ -76,6 +76,7 @@ class OrderCreate(BaseModel):
     payment_method: str = "card"
     bank_account_id: Optional[str] = None
     crypto_network_id: Optional[str] = None
+    clear_cart: bool = True
 
 class OrderUpdateStatus(BaseModel):
     status: OrderStatus