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}