From ce0c1808fbf9a03f08a0d52700a0c8dbf6583fda Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 23 Mar 2025 06:03:38 +0000 Subject: [PATCH 1/7] Feat: validate live payment --- src/lib/sdk/billing.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index 68db777fb..1ad1b22f0 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -739,6 +739,14 @@ export class Billing { ); } + async validateInvoice(organizationId: string, invoiceId: string): Promise { + const path = `/organizations/${organizationId}/invoices/${invoiceId}/validate`; + const uri = new URL(this.client.config.endpoint + path); + return await this.client.call('PATCH', uri, { + 'content-type': 'application/json' + }); + } + async retryPayment( organizationId: string, invoiceId: string, From bbad6365c06eddebed00ab66efe260b460dec166 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 23 Mar 2025 06:04:15 +0000 Subject: [PATCH 2/7] Validate invoice after retrying payment live --- .../billing/+page.svelte | 16 ++++++++++++++-- .../billing/retryPaymentModal.svelte | 7 ++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index 2d3772358..1bcc49d92 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -19,7 +19,9 @@ import RetryPaymentModal from './retryPaymentModal.svelte'; import { selectedInvoice, showRetryModal } from './store'; import { Button } from '$lib/elements/forms'; - import { goto } from '$app/navigation'; + import { goto, invalidate } from '$app/navigation'; + import { Dependencies } from '$lib/constants'; + import { base } from '$app/paths'; export let data; @@ -50,10 +52,20 @@ await confirmPayment( $organization.$id, invoice.clientSecret, - $organization.paymentMethodId + $organization.paymentMethodId, + `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}` ); } + if ( + $page.url.searchParams.has('type') && + $page.url.searchParams.get('type') === 'validate-invoice' + ) { + const invoiceId = $page.url.searchParams.get('invoice'); + await sdk.forConsole.billing.validateInvoice($organization.$id, invoiceId); + invalidate(Dependencies.INVOICES); + } + if ( $page.url.searchParams.has('invoice') && $page.url.searchParams.get('type') === 'retry' diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte index 7606cbf98..95007936d 100644 --- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte +++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte @@ -20,6 +20,7 @@ import { onMount } from 'svelte'; import { getApiEndpoint, sdk } from '$lib/stores/sdk'; import { formatCurrency } from '$lib/helpers/numbers'; + import { base } from '$app/paths'; export let show = false; export let invoice: Invoice; @@ -79,8 +80,12 @@ await confirmPayment( $organization.$id, clientSecret, - paymentMethodId ? paymentMethodId : $organization.paymentMethodId + paymentMethodId ? paymentMethodId : $organization.paymentMethodId, + `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}` ); + + await sdk.forConsole.billing.validateInvoice($organization.$id, invoice.$id); + invalidate(Dependencies.ORGANIZATION); invalidate(Dependencies.INVOICES); From 9d73ecc74c6499c802af64c2eee5d6e46c8e3921 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 24 Mar 2025 05:59:21 +0000 Subject: [PATCH 3/7] Fix: alerts and update history after validation --- src/lib/stores/billing.ts | 36 ++++++++++++------- src/lib/stores/organization.ts | 2 ++ .../billing/+page.svelte | 1 + .../billing/paymentHistory.svelte | 7 +++- .../teamReadonlyAlert.svelte | 29 +++++++++++++++ 5 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 3923ce250..0cfd78499 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -33,6 +33,7 @@ import { canSeeBilling } from './roles'; import { sdk } from './sdk'; import { user } from './user'; import BudgetLimitAlert from '$routes/(console)/organization-[organization]/budgetLimitAlert.svelte'; +import TeamReadonlyAlert from '$routes/(console)/organization-[organization]/teamReadonlyAlert.svelte'; export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'auto-1' | 'cont-1' | 'ent-1'; @@ -59,6 +60,9 @@ export const roles = [ } ]; +export const teamStatusReadonly = 'readonly'; +export const billingLimitOutstandingInvoice = 'outstanding_invoice'; + export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods as PaymentList); export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList); export const plansInfo = derived(page, ($page) => $page.data.plansInfo as PlansMap); @@ -270,27 +274,35 @@ export function calculateTrialDay(org: Organization) { } export async function checkForUsageLimit(org: Organization) { - if (!org?.billingLimits) { + if (org?.status === teamStatusReadonly && org?.remarks === billingLimitOutstandingInvoice) { + headerAlert.add({ + id: 'teamReadOnlyFailedInvoices', + component: TeamReadonlyAlert, + show: true, + importance: 11 + }); + readOnly.set(true); + return; + } + if (!org?.billingLimits && org?.status !== teamStatusReadonly) { readOnly.set(false); return; } if (org?.billingPlan !== BillingPlan.FREE) { const { budgetLimit } = org?.billingLimits ?? {}; - if (!budgetLimit || budgetLimit < 100) { + if (budgetLimit && budgetLimit >= 100) { readOnly.set(false); + headerAlert.add({ + id: 'budgetLimit', + component: BudgetLimitAlert, + show: true, + importance: 10 + }); + + readOnly.set(true); return; } - - headerAlert.add({ - id: 'budgetLimit', - component: BudgetLimitAlert, - show: true, - importance: 10 - }); - - readOnly.set(true); - return; } const { bandwidth, documents, executions, storage, users } = org?.billingLimits ?? {}; const resources = [ diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 3f02fe50a..471c25d21 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -32,6 +32,8 @@ export type Organization = Models.Team> & { billingPlanDowngrade?: Tier; billingAggregationId: string; billingInvoiceId: string; + status: string; + remarks: string; }; export type OrganizationList = { diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index 1bcc49d92..61785f641 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -64,6 +64,7 @@ const invoiceId = $page.url.searchParams.get('invoice'); await sdk.forConsole.billing.validateInvoice($organization.$id, invoiceId); invalidate(Dependencies.INVOICES); + invalidate(Dependencies.ORGANIZATION); } if ( diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte index 67a5fbc58..1272dc466 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte @@ -51,6 +51,11 @@ ]); } + $: if ($page.url.searchParams.get('type') === 'validate-invoice') { + window.history.replaceState({}, '', $page.url.pathname); + request(); + } + function retryPayment(invoice: Invoice) { $selectedInvoice = invoice; $showRetryModal = true; @@ -62,7 +67,7 @@ - Payment history + Payment history

Transaction history for this organization. Download invoices for more details about your diff --git a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte new file mode 100644 index 000000000..aad6374b2 --- /dev/null +++ b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte @@ -0,0 +1,29 @@ + + +{#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} + + + Access to your organization resources has been restricted as you have unpaid invoices. + Please pay the invoice to restore access. + + + + + +{/if} From 5abd221288dc8109fb14f789609c27600a88231d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 24 Mar 2025 06:10:45 +0000 Subject: [PATCH 4/7] fix error --- .../organization-[organization]/teamReadonlyAlert.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte index aad6374b2..81fcd74f1 100644 --- a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte +++ b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte @@ -11,7 +11,7 @@ } from '$lib/stores/billing'; import { base } from '$app/paths'; - $: redirectUrl = `${base}/organization-${$organization.$id}/billing#payment-history`; + $: redirectUrl = `${base}/organization-${$organization?.$id}/billing#payment-history`; {#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} From e2ba867f16a7d36fbe21930ff37fc8b3c65f6f17 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 24 Mar 2025 07:48:47 +0000 Subject: [PATCH 5/7] Fix alert copy --- .../organization-[organization]/teamReadonlyAlert.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte index 81fcd74f1..19fc2bf37 100644 --- a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte +++ b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte @@ -17,8 +17,8 @@ {#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} - Access to your organization resources has been restricted as you have unpaid invoices. - Please pay the invoice to restore access. + Your organization’s access to resources has been restricted due to unpaid invoices. + Payment is required to restore access.