From d741f7c9dc254751dbdc938be9bd4d86cc26f627 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 15 May 2025 11:18:36 +0530
Subject: [PATCH 1/2] update: confirmation logic.

---
 .../billing/retryPaymentModal.svelte            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
index 94fe73d44..92a927b86 100644
--- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
@@ -71,18 +71,21 @@
             if (setAsDefault) {
                 await sdk.forConsole.billing.setDefaultPaymentMethod(paymentMethodId);
             }
-            const { clientSecret } = await sdk.forConsole.billing.retryPayment(
+            const { clientSecret, status } = await sdk.forConsole.billing.retryPayment(
                 $organization.$id,
                 invoice.$id,
                 paymentMethodId
             );
 
-            await confirmPayment(
-                $organization.$id,
-                clientSecret,
-                paymentMethodId ? paymentMethodId : $organization.paymentMethodId,
-                `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}`
-            );
+            if (status !== 'succeeded' && status !== 'cancelled') {
+                // probably still pending, confirm via stripe!
+                await confirmPayment(
+                    $organization.$id,
+                    clientSecret,
+                    paymentMethodId ? paymentMethodId : $organization.paymentMethodId,
+                    `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}`
+                );
+            }
 
             await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id);
 

From 06302e9dc61b05c8a6a4db0f5b03ca95026fac7d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 15 May 2025 11:24:07 +0530
Subject: [PATCH 2/2] address comments.

---
 .../billing/retryPaymentModal.svelte                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
index 92a927b86..7f5194be5 100644
--- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
@@ -85,9 +85,9 @@
                     paymentMethodId ? paymentMethodId : $organization.paymentMethodId,
                     `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}`
                 );
-            }
 
-            await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id);
+                await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id);
+            }
 
             invalidate(Dependencies.ORGANIZATION);
             invalidate(Dependencies.INVOICES);