fix: outdated billing usage.

Author: ItzNotABug

package.json

@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "1.4.7",
+        "@appwrite.io/console": "1.5.2",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",

pnpm-lock.yaml

@@ -83,7 +83,7 @@
             {#if excess?.members}
                 <TableRow>
                     <TableCellText title="members">Organization members</TableCellText>
-                    <TableCellText title="limit">{plan.members} members</TableCellText>
+                    <TableCellText title="limit">{plan.addons.seats.limit} members</TableCellText>
                     <TableCell title="excess">
                         <p class="u-color-text-danger u-flex u-cross-center u-gap-4">
                             <span class="icon-arrow-up" />

src/lib/components/billing/planExcess.svelte

@@ -85,7 +85,7 @@
                         </TableCellText>
                         {#if !isFree}
                             <TableCellText title="rate">
-                                {formatCurrency(plan.addons.member.price)}/{usage?.unit}
+                                {formatCurrency(plan.addons.seats.price)}/{usage?.unit}
                             </TableCellText>
                         {/if}
                     </TableRow>

src/lib/components/billing/usageRates.svelte

@@ -257,13 +257,25 @@ export type AdditionalResource = {
     multiplier?: number;
 };
 
+export type PlanAddon = {
+    supported: boolean;
+    currency: string;
+    invoiceDesc: string;
+    price: number;
+    limit: number;
+    value: number;
+    type: string;
+};
+
 export type Plan = {
     $id: string;
     name: string;
+    desc: string;
     price: number;
+    order: number;
     bandwidth: number;
     storage: number;
-    members: number;
+    imageTransformations: number;
     webhooks: number;
     users: number;
     teams: number;
@@ -275,14 +287,17 @@ export type Plan = {
     realtime: number;
     logs: number;
     authPhone: number;
-    addons: {
+    usage: {
         bandwidth: AdditionalResource;
         executions: AdditionalResource;
         member: AdditionalResource;
         realtime: AdditionalResource;
         storage: AdditionalResource;
         users: AdditionalResource;
     };
+    addons: {
+        seats: PlanAddon;
+    };
     trialDays: number;
     isAvailable: boolean;
     selfService: boolean;
@@ -292,6 +307,7 @@ export type Plan = {
     backupsEnabled: boolean;
     backupPolicies: number;
     emailBranding: boolean;
+    supportsCredits: boolean;
 };
 
 export type PlansInfo = {

src/lib/sdk/billing.ts

@@ -273,7 +273,8 @@ export async function checkForUsageLimit(org: Organization) {
 
     const members = org.total;
     const plan = get(plansInfo)?.get(org.billingPlan);
-    const membersOverflow = members > plan.members ? members - (plan.members || members) : 0;
+    const membersOverflow =
+        members > plan.addons.seats.limit ? members - (plan.addons.seats.limit || members) : 0;
 
     if (resources.some((r) => r.value >= 100) || membersOverflow > 0) {
         readOnly.set(true);
@@ -476,7 +477,7 @@ export function calculateExcess(usage: OrganizationUsage, plan: Plan, members: n
         storage: calculateResourceSurplus(usage?.storageTotal, plan.storage, 'GB'),
         users: calculateResourceSurplus(usage?.usersTotal, plan.users),
         executions: calculateResourceSurplus(usage?.executionsTotal, plan.executions, 'GB'),
-        members: calculateResourceSurplus(members, plan.members)
+        members: calculateResourceSurplus(members, plan.addons.seats.limit)
     };
 }
 

src/lib/stores/billing.ts

@@ -87,8 +87,7 @@
                                                 <div>
                                                     {formatCurrency(
                                                         extraMembers *
-                                                            (currentPlan?.addons?.member?.price ??
-                                                                0)
+                                                            (currentPlan?.addons?.seats?.price ?? 0)
                                                     )}
                                                 </div>
                                             </div>

src/routes/(console)/organization-[organization]/billing/planSummary.svelte

@@ -287,7 +287,7 @@
                         <b
                             >you will be charged {formatCurrency(
                                 extraMembers *
-                                    ($plansInfo?.get(billingPlan)?.addons?.member?.price ?? 0)
+                                    ($plansInfo?.get(billingPlan)?.addons?.seats?.price ?? 0)
                             )} monthly for {extraMembers} team members.</b> This will be reflected in
                         your next invoice.
                     </Alert>

src/routes/(console)/organization-[organization]/change-plan/+page.svelte

@@ -46,7 +46,7 @@
                     <span
                         class="icon-info"
                         use:tooltip={{
-                            content: `You can add unlimited organization members on the ${tierToPlan($organization.billingPlan).name} plan ${$organization.billingPlan === BillingPlan.PRO ? `for ${formatCurrency(plan.addons.member.price)} each per billing period.` : '.'}`
+                            content: `You can add unlimited organization members on the ${tierToPlan($organization.billingPlan).name} plan ${$organization.billingPlan === BillingPlan.PRO ? `for ${formatCurrency(plan.addons.seats.price)} each per billing period.` : '.'}`
                         }}></span>
                 </p>
             </div>

src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import { page } from '$app/stores';
+    import { Code } from '$lib/components';
     import { WizardStep } from '$lib/layout';
-    import { Code, Id } from '$lib/components';
     import { getProjectEndpoint } from '$lib/helpers/project';
 
     const project = $page.params.project;