improvement(billing): immediately charge for billing upgrades

Author: icecrasher321

apps/sim/app/api/billing/switch-plan/route.ts

@@ -142,7 +142,7 @@ export async function POST(request: NextRequest) {
             quantity: currentQuantity,
           },
         ],
-        proration_behavior: 'create_prorations',
+        proration_behavior: 'always_invoice',
       })
     }
 

apps/sim/lib/billing/webhooks/invoices.ts

@@ -469,6 +469,15 @@ export async function handleInvoicePaymentSucceeded(event: Stripe.Event) {
       return
     }
 
+    // Skip proration invoices (e.g. from mid-cycle plan upgrades) — only process cycle renewals
+    if (invoice.billing_reason && invoice.billing_reason !== 'subscription_cycle') {
+      logger.info('Skipping non-cycle invoice payment succeeded', {
+        invoiceId: invoice.id,
+        billingReason: invoice.billing_reason,
+      })
+      return
+    }
+
     const records = await db
       .select()
       .from(subscriptionTable)
@@ -556,6 +565,20 @@ export async function handleInvoicePaymentFailed(event: Stripe.Event) {
       return
     }
 
+    // Skip proration invoices (e.g. from mid-cycle plan upgrades) — don't block users over proration failures.
+    // Overage invoices (threshold + cycle-end) bypass this guard via !isOverageInvoice and still block.
+    if (
+      !isOverageInvoice &&
+      invoice.billing_reason &&
+      invoice.billing_reason !== 'subscription_cycle'
+    ) {
+      logger.info('Skipping non-cycle invoice payment failure', {
+        invoiceId: invoice.id,
+        billingReason: invoice.billing_reason,
+      })
+      return
+    }
+
     // Extract and validate customer ID
     const customerId = invoice.customer
     if (!customerId || typeof customerId !== 'string') {