From 1f4d93b7d2e138b4fc3640b0814b0308b4d92837 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 6 Aug 2024 15:04:10 +0200 Subject: [PATCH] refactor: invoice model --- src/lib/sdk/billing.ts | 10 ++++++++-- .../usage/[[invoice]]/+page.svelte | 2 +- .../settings/usage/[[invoice]]/+page.svelte | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index bca6cbb0a..6bef84cc5 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -31,17 +31,23 @@ export type Invoice = { $id: string; $createdAt: Date; $updatedAt: Date; + permissions: string[]; teamId: string; aggregationId: string; + plan: Tier; amount: number; + tax: number; + taxAmount: number; + vat: number; + vatAmount: number; + grossAmount: number; + creditsUsed: number; currency: string; - date: number; from: string; to: string; status: string; dueAt: string; clientSecret: string; - tier: Tier; usage: { name: string; value: number /* service over the limit*/; diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte index bbfa4c4b9..7941d2040 100644 --- a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -21,7 +21,7 @@ export let data; - const tier = data?.currentInvoice?.tier ?? $organization?.billingPlan; + const tier = data?.currentInvoice?.plan ?? $organization?.billingPlan; const plan = tierToPlan(tier).name; // let invoice = null; diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index a4d52bdf4..ef502dfc7 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -29,7 +29,7 @@ $: executionsTotal = data.usage.executionsTotal; $: storage = data.usage.filesStorageTotal; - const tier = data?.currentInvoice?.tier ?? $organization?.billingPlan; + const tier = data?.currentInvoice?.plan ?? $organization?.billingPlan; const plan = tierToPlan(tier).name; // let invoice = null;