Merge pull request #2299 from appwrite/fix-plan-summary

plan summary respect downgrade using next plan

Author: lohanidamodar

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

@@ -132,6 +132,7 @@
         <PlanSummary
             availableCredit={data?.availableCredit}
             currentPlan={data?.currentPlan}
+            nextPlan={data?.nextPlan}
             currentAggregation={data?.billingAggregation} />
     {:else}
         <PlanSummaryOld

src/routes/(console)/organization-[organization]/billing/+page.ts

@@ -57,12 +57,18 @@ export const load: PageLoad = async ({ parent, depends }) => {
               organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION))
         : false;
 
-    const [paymentMethods, addressList, billingAddress, availableCredit] = await Promise.all([
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listAddresses(),
-        billingAddressPromise,
-        areCreditsSupported ? sdk.forConsole.billing.getAvailableCredit(organization.$id) : null
-    ]);
+    const [paymentMethods, addressList, billingAddress, availableCredit, billingPlanDowngrade] =
+        await Promise.all([
+            sdk.forConsole.billing.listPaymentMethods(),
+            sdk.forConsole.billing.listAddresses(),
+            billingAddressPromise,
+            areCreditsSupported
+                ? sdk.forConsole.billing.getAvailableCredit(organization.$id)
+                : null,
+            organization.billingPlanDowngrade
+                ? sdk.forConsole.billing.getPlan(organization.billingPlanDowngrade)
+                : null
+        ]);
 
     // make number
     const credits = availableCredit ? availableCredit.available : null;
@@ -76,6 +82,7 @@ export const load: PageLoad = async ({ parent, depends }) => {
         billingInvoice,
         areCreditsSupported,
         countryList,
-        locale
+        locale,
+        nextPlan: billingPlanDowngrade
     };
 };

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

@@ -24,6 +24,7 @@
     import { IconTag } from '@appwrite.io/pink-icons-svelte';
 
     export let currentPlan: Plan;
+    export let nextPlan: Plan | null = null;
     export let currentAggregation: AggregationTeam | undefined = undefined;
     export let availableCredit: number | undefined = undefined;
 
@@ -149,10 +150,7 @@
                 item: 'Base plan',
                 usage: '',
                 price: formatCurrency(
-                    Math.max(
-                        (currentAggregation?.amount ?? currentPlan?.price ?? 0) - availableCredit,
-                        0
-                    )
+                    Math.max((nextPlan?.price ?? currentPlan?.price ?? 0) - availableCredit, 0)
                 )
             },
             children: []