Merge pull request #1514 from appwrite/feat-plan-summary-to-server-load

Load all data for plan summary in advance
appwrite · Nov 13, 2024 · c197f15 · c197f15
2 parents 77f693d + 476df58
commit c197f15
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 180 deletions.
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -120,7 +120,11 @@
     <div class="common-section">
         <Heading tag="h2" size="5">Billing</Heading>
     </div>
-    <PlanSummary />
+    <PlanSummary
+        creditList={data?.creditList}
+        members={data?.members}
+        currentPlan={data?.currentPlan}
+        invoices={data?.invoices.invoices} />
     <PaymentHistory />
     <PaymentMethods />
     <BillingAddress billingAddress={data?.billingAddress} />

diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
@@ -4,6 +4,7 @@ import type { Organization } from '$lib/stores/organization';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
+import { Query } from '@appwrite.io/console';
 
 export const load: PageLoad = async ({ parent, depends }) => {
     const { organization, scopes } = await parent();
@@ -24,17 +25,34 @@ export const load: PageLoad = async ({ parent, depends }) => {
               .catch(() => null)
         : null;
 
-    const [paymentMethods, addressList, aggregationList, billingAddress] = await Promise.all([
+    const [
+        paymentMethods,
+        addressList,
+        aggregationList,
+        billingAddress,
+        currentPlan,
+        creditList,
+        invoices
+    ] = await Promise.all([
         sdk.forConsole.billing.listPaymentMethods(),
         sdk.forConsole.billing.listAddresses(),
         sdk.forConsole.billing.listAggregation(organization.$id),
-        billingAddressPromise
+        billingAddressPromise,
+        sdk.forConsole.billing.getPlan(organization.$id),
+        sdk.forConsole.billing.listCredits(organization.$id),
+        sdk.forConsole.billing.listInvoices(organization.$id, [
+            Query.limit(1),
+            Query.equal('from', organization.billingCurrentInvoiceDate)
+        ])
     ]);
 
     return {
         paymentMethods,
         addressList,
         aggregationList,
-        billingAddress
+        billingAddress,
+        currentPlan,
+        creditList,
+        invoices
     };
 };