From 14a0cacbf68c0e41ec36ef82e32c2ef90489d370 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 23 Dec 2024 08:17:14 +0545 Subject: [PATCH] refactor --- .../organization-[organization]/billing/+page.svelte | 3 +-- .../(console)/organization-[organization]/billing/+page.ts | 6 ------ .../organization-[organization]/billing/planSummary.svelte | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index ad680d21a..bf09c5575 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -124,8 +124,7 @@ creditList={data?.creditList} members={data?.members} currentPlan={data?.aggregationBillingPlan} - currentInvoice={data?.billingInvoice} - invoices={data?.invoices.invoices} /> + currentInvoice={data?.billingInvoice} /> diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts index c98183028..25c390c2a 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.ts +++ b/src/routes/(console)/organization-[organization]/billing/+page.ts @@ -36,7 +36,6 @@ export const load: PageLoad = async ({ parent, depends }) => { aggregationList, billingAddress, creditList, - invoices, aggregationBillingPlan, billingInvoice, ] = await Promise.all([ @@ -45,10 +44,6 @@ export const load: PageLoad = async ({ parent, depends }) => { sdk.forConsole.billing.listAggregation(organization.$id), billingAddressPromise, sdk.forConsole.billing.listCredits(organization.$id), - sdk.forConsole.billing.listInvoices(organization.$id, [ - Query.limit(1), - Query.equal('from', organization.billingCurrentInvoiceDate) - ]), sdk.forConsole.billing.getPlan(billingAggregation.plan), sdk.forConsole.billing.getInvoice(organization.$id, billingInvoiceId) ]); @@ -60,7 +55,6 @@ export const load: PageLoad = async ({ parent, depends }) => { billingAddress, aggregationBillingPlan, creditList, - invoices, billingAggregation, billingInvoice }; diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index 2ef69316b..eeaee9aba 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -3,7 +3,7 @@ import { CardGrid, Collapsible, CollapsibleItem, Heading } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { toLocaleDate } from '$lib/helpers/date'; - import { plansInfo, tierToPlan, upgradeURL } from '$lib/stores/billing'; + import { plansInfo, upgradeURL } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; import type { CreditList, Invoice, Plan } from '$lib/sdk/billing'; import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; @@ -13,7 +13,6 @@ import { tooltip } from '$lib/actions/tooltip'; import { type Models } from '@appwrite.io/console'; - export let invoices: Array; export let members: Models.MembershipList; export let currentPlan: Plan; export let creditList: CreditList;