Fix: add callback_url to Razorpay subscription + poll for plan update after payment

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 2 people

backend/services/razorpay_service.py

@@ -56,6 +56,7 @@ async def create_subscription(user_id: str, plan_id: str, email: str = "") -> st
             "Create plans at razorpay.com → Subscriptions → Plans."
         )
 
+    frontend_url = (settings.FRONTEND_URL or "http://localhost:3000").rstrip("/")
     client = _client()
     try:
         subscription = client.subscription.create({
@@ -65,6 +66,8 @@ async def create_subscription(user_id: str, plan_id: str, email: str = "") -> st
             "customer_notify": 1,
             "notes": {"user_id": user_id},
             "notify_info": {"notify_email": email} if email else {},
+            "callback_url": f"{frontend_url}/billing?success=true",
+            "callback_method": "get",
         })
 
         short_url = subscription.get("short_url")

frontend/pages/billing/index.tsx

@@ -101,17 +101,22 @@ export default function BillingPage() {
     }
   }, [session, sessionLoading, router]);
 
-  // Handle Stripe return
+  // Handle Razorpay return
+  const { mutate: refreshBilling } = useBillingStatus();
   useEffect(() => {
-    const { success, canceled } = router.query;
+    const { success } = router.query;
     if (success === 'true') {
-      toast.success('Subscription activated! Welcome to your new plan.');
-      router.replace('/billing', undefined, { shallow: true });
-    } else if (canceled === 'true') {
-      toast('Checkout canceled.', { icon: 'ℹ️' });
+      toast.success('Payment successful! Activating your plan...');
       router.replace('/billing', undefined, { shallow: true });
+      // Poll every 3s for up to 30s until plan updates via webhook
+      let attempts = 0;
+      const interval = setInterval(() => {
+        refreshBilling();
+        attempts++;
+        if (attempts >= 10) clearInterval(interval);
+      }, 3000);
     }
-  }, [router]);
+  }, [router.query.success]);
 
   if (sessionLoading || billingLoading) return <LoadingSpinner fullPage />;
   if (!session) return null;