Feat: invoice cycle changes

src/lib/commandCenter/searchers/organizations.ts

@@ -4,7 +4,7 @@ import { sdk } from '$lib/stores/sdk';
 import type { Searcher } from '../commands';
 
 export const orgSearcher = (async (query: string) => {
-    const { teams } = await sdk.forConsole.teams.list();
+    const { teams } = await sdk.forConsole.billing.listOrganization();
     return teams
         .filter((organization) => organization.name.toLowerCase().includes(query.toLowerCase()))
         .map((organization) => {

src/lib/components/billing/planSelection.svelte

@@ -76,31 +76,29 @@
                 </svelte:fragment>
             </LabelCard>
         </li>
-        {#if $organization?.billingPlan === BillingPlan.SCALE}
-            <li>
-                <LabelCard
-                    name="plan"
-                    bind:group={billingPlan}
-                    value={BillingPlan.SCALE}
-                    padding={1.5}>
-                    <svelte:fragment slot="custom">
-                        <div class="u-flex u-flex-vertical u-gap-4 u-width-full-line">
-                            <h4 class="body-text-2 u-bold">
-                                {tierScale.name}
-                                {#if $organization?.billingPlan === BillingPlan.SCALE && !isNewOrg}
-                                    <span class="inline-tag">Current plan</span>
-                                {/if}
-                            </h4>
-                            <p class="u-color-text-offline u-small">
-                                {tierScale.description}
-                            </p>
-                            <p>
-                                {formatCurrency(scalePlan?.price ?? 0)} per month + usage
-                            </p>
-                        </div>
-                    </svelte:fragment>
-                </LabelCard>
-            </li>
-        {/if}
+        <li>
+            <LabelCard
+                name="plan"
+                bind:group={billingPlan}
+                value={BillingPlan.SCALE}
+                padding={1.5}>
+                <svelte:fragment slot="custom">
+                    <div class="u-flex u-flex-vertical u-gap-4 u-width-full-line">
+                        <h4 class="body-text-2 u-bold">
+                            {tierScale.name}
+                            {#if $organization?.billingPlan === BillingPlan.SCALE && !isNewOrg}
+                                <span class="inline-tag">Current plan</span>
+                            {/if}
+                        </h4>
+                        <p class="u-color-text-offline u-small">
+                            {tierScale.description}
+                        </p>
+                        <p>
+                            {formatCurrency(scalePlan?.price ?? 0)} per month + usage
+                        </p>
+                    </div>
+                </svelte:fragment>
+            </LabelCard>
+        </li>
     </ul>
 {/if}

src/lib/components/billing/usageRates.svelte

@@ -81,16 +81,16 @@
                     <TableRow>
                         <TableCellText title="resource">{usage.resource}</TableCellText>
                         <TableCellText title="limit">
-                            {plan[usage.id] || 'Unlimited'}
+                            {plan.addons.seats.limit || 0}
                         </TableCellText>
                         {#if !isFree}
                             <TableCellText title="rate">
-                                {formatCurrency(plan.addons.member.price)}/{usage?.unit}
+                                {formatCurrency(plan.addons.seats.price)}/{usage?.unit}
                             </TableCellText>
                         {/if}
                     </TableRow>
                 {:else}
-                    {@const addon = plan.addons[usage.id]}
+                    {@const addon = plan.usage[usage.id]}
                     <TableRow>
                         <TableCellText title="resource">{usage.resource}</TableCellText>
                         <TableCellText title="limit">

src/lib/sdk/billing.ts

@@ -1,5 +1,5 @@
 import type { Client, Models } from '@appwrite.io/console';
-import type { Organization, OrganizationList } from '../stores/organization';
+import type { OrganizationError, Organization, OrganizationList } from '../stores/organization';
 import type { PaymentMethod } from '@stripe/stripe-js';
 import type { Tier } from '$lib/stores/billing';
 import type { Campaign } from '$lib/stores/campaigns';
@@ -174,6 +174,10 @@ export type Aggregation = {
      * Usage logs for the billing period.
      */
     resources: OrganizationUsage;
+    /**
+     * Aggregation billing plan
+     */
+    plan: string;
 };
 
 export type OrganizationUsage = {
@@ -253,13 +257,23 @@ 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;
     price: number;
     bandwidth: number;
     storage: number;
-    members: number;
     webhooks: number;
     users: number;
     teams: number;
@@ -270,14 +284,17 @@ export type Plan = {
     executions: number;
     realtime: number;
     logs: number;
-    addons: {
+    usage: {
         bandwidth: AdditionalResource;
         executions: AdditionalResource;
         member: AdditionalResource;
         realtime: AdditionalResource;
         storage: AdditionalResource;
         users: AdditionalResource;
     };
+    addons: {
+        seats: PlanAddon
+    }
     trialDays: number;
     isAvailable: boolean;
     selfService: boolean;
@@ -287,6 +304,7 @@ export type Plan = {
     backupsEnabled: boolean;
     backupPolicies: number;
     emailBranding: boolean;
+    supportsCredit: boolean;
 };
 
 export type PlansInfo = {
@@ -324,20 +342,48 @@ export class Billing {
         );
     }
 
+    async validateOrganization(
+        organizationId: string,
+        invites: string[],
+    ): Promise<Organization> {
+        const path = `/organizations/${organizationId}/validate`;
+        const params = {
+            organizationId,
+            invites,
+        };
+        const uri = new URL(this.client.config.endpoint + path);
+        return await this.client.call(
+            'PATCH',
+            uri,
+            {
+                'content-type': 'application/json'
+            },
+            params
+        );
+    }
+
     async createOrganization(
         organizationId: string,
         name: string,
         billingPlan: string,
         paymentMethodId: string,
-        billingAddressId: string = undefined
-    ): Promise<Organization> {
+        billingAddressId: string = null,
+        couponId: string = null,
+        invites: Array<string> = [],
+        budget: number = undefined,
+        taxId: string = null
+    ): Promise<Organization | OrganizationError> {
         const path = `/organizations`;
         const params = {
             organizationId,
             name,
             billingPlan,
             paymentMethodId,
-            billingAddressId
+            billingAddressId,
+            couponId,
+            invites,
+            budget,
+            taxId
         };
         const uri = new URL(this.client.config.endpoint + path);
         return await this.client.call(
@@ -366,19 +412,27 @@ export class Billing {
         );
     }
 
-    async getPlan(organizationId: string): Promise<Plan> {
+    async getOrganizationPlan(organizationId: string): Promise<Plan> {
         const path = `/organizations/${organizationId}/plan`;
-        const params = {
-            organizationId
-        };
         const uri = new URL(this.client.config.endpoint + path);
         return await this.client.call(
             'get',
             uri,
             {
                 'content-type': 'application/json'
-            },
-            params
+            }
+        );
+    }
+
+    async getPlan(planId: string): Promise<Plan> {
+        const path = `/console/plans/${planId}`;
+        const uri = new URL(this.client.config.endpoint + path);
+        return await this.client.call(
+            'get',
+            uri,
+            {
+                'content-type': 'application/json'
+            }
         );
     }
 
@@ -394,14 +448,22 @@ export class Billing {
         organizationId: string,
         billingPlan: string,
         paymentMethodId: string,
-        billingAddressId: string = undefined
-    ): Promise<Organization> {
+        billingAddressId: string = undefined,
+        couponId: string = null,
+        invites: Array<string> = [],
+        budget: number = undefined,
+        taxId: string = null
+    ): Promise<Organization | OrganizationError> {
         const path = `/organizations/${organizationId}/plan`;
         const params = {
             organizationId,
             billingPlan,
             paymentMethodId,
-            billingAddressId
+            billingAddressId,
+            couponId,
+            invites,
+            budget,
+            taxId
         };
         const uri = new URL(this.client.config.endpoint + path);
         return await this.client.call(
@@ -413,6 +475,19 @@ export class Billing {
             params
         );
     }
+    async cancelDowngrade(
+        organizationId: string
+    ): Promise<Organization | OrganizationError> {
+        const path = `/organizations/${organizationId}/plan/cancel`;
+        const uri = new URL(this.client.config.endpoint + path);
+        return await this.client.call(
+            'patch',
+            uri,
+            {
+                'content-type': 'application/json'
+            }
+        );
+    }
 
     async updateBudget(
         organizationId: string,

src/lib/stores/billing.ts

@@ -272,7 +272,7 @@ 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 - 1) > plan.addons.seats.limit ? members - (plan.addons.seats.limit || members) : 0;
 
     if (resources.some((r) => r.value >= 100) || membersOverflow > 0) {
         readOnly.set(true);
@@ -475,7 +475,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 - 1, plan.addons.seats.limit || 0)
     };
 }
 

src/lib/stores/organization.ts

@@ -4,6 +4,15 @@ import type { Models } from '@appwrite.io/console';
 import type { Tier } from './billing';
 import type { Plan } from '$lib/sdk/billing';
 
+export type OrganizationError = {
+    status: number;
+    message: string;
+    teamId: string;
+    invoiceId: string;
+    clientSecret: string;
+    type: string;
+};
+
 export type Organization = Models.Team<Record<string, unknown>> & {
     billingBudget: number;
     billingPlan: Tier;
@@ -21,6 +30,8 @@ export type Organization = Models.Team<Record<string, unknown>> & {
     amount: number;
     billingTaxId?: string;
     billingPlanDowngrade?: Tier;
+    billingAggregationId: string;
+    billingInvoiceId: string;
 };
 
 export type OrganizationList = {

src/lib/stores/stripe.ts

@@ -117,7 +117,8 @@ export async function confirmPayment(
     orgId: string,
     clientSecret: string,
     paymentMethodId: string,
-    route?: string
+    route?: string,
+    returnError: boolean = false
 ) {
     try {
         const url =
@@ -129,10 +130,13 @@ export async function confirmPayment(
             clientSecret: clientSecret,
             confirmParams: {
                 return_url: url,
-                payment_method: paymentMethod.providerMethodId
-            }
+                payment_method: paymentMethod.providerMethodId,
+            },
         });
         if (error) {
+            if (returnError) {
+                return error;
+            }
             throw error.message;
         }
     } catch (e) {

src/routes/(console)/account/organizations/+page.ts

@@ -3,19 +3,24 @@ import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
+import { isCloud } from '$lib/system';
 
 export const load: PageLoad = async ({ url, route }) => {
     const page = getPage(url);
     const limit = getLimit(url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
 
+    const queries = [
+        Query.offset(offset),
+        Query.limit(limit),
+        Query.orderDesc('')
+    ];
+
+    const organizations = isCloud ? await sdk.forConsole.billing.listOrganization(queries) : sdk.forConsole.teams.list(queries);
+
     return {
         offset,
         limit,
-        organizations: await sdk.forConsole.teams.list([
-            Query.offset(offset),
-            Query.limit(limit),
-            Query.orderDesc('')
-        ])
+        organizations
     };
 };