From 4bacc238d8a83bc5385e376781be91b1014d0993 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 2 Aug 2023 18:42:42 +0200 Subject: [PATCH] feat: update card, billing addres (wip) --- src/lib/stores/organization.ts | 1 + .../account/payments/addressModal.svelte | 97 +++++++++++++++++++ .../account/payments/billingAddress.svelte | 10 +- .../account/payments/editPaymentModal.svelte | 51 +++++++--- .../billing/+page.ts | 6 +- .../billing/planSummary.svelte | 5 +- .../billing/store.ts | 8 ++ .../usage/[[period]]/+page.svelte | 22 ++++- .../usage/[[period]]/+page.ts | 2 +- 9 files changed, 179 insertions(+), 23 deletions(-) create mode 100644 src/routes/console/account/payments/addressModal.svelte create mode 100644 src/routes/console/organization-[organization]/billing/store.ts diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 4dbc4e60a..747418579 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -12,6 +12,7 @@ export type Organization = Models.Team> & { billingNextInvoiceDate: string; billingTrialStartDate?: string; billingTrialDays?: number; + amount: number; }; export const newOrgModal = writable(false); diff --git a/src/routes/console/account/payments/addressModal.svelte b/src/routes/console/account/payments/addressModal.svelte new file mode 100644 index 000000000..aa3245710 --- /dev/null +++ b/src/routes/console/account/payments/addressModal.svelte @@ -0,0 +1,97 @@ + + + + Add billing address + + + + + + + + + + + diff --git a/src/routes/console/account/payments/billingAddress.svelte b/src/routes/console/account/payments/billingAddress.svelte index 93de721d1..18cc7025d 100644 --- a/src/routes/console/account/payments/billingAddress.svelte +++ b/src/routes/console/account/payments/billingAddress.svelte @@ -1,5 +1,11 @@ @@ -9,8 +15,10 @@ View or update your billing address. This address will appear on your invoice.

- + (show = true)}>

Add a billing address

+ + diff --git a/src/routes/console/account/payments/editPaymentModal.svelte b/src/routes/console/account/payments/editPaymentModal.svelte index a1f1754b2..708541437 100644 --- a/src/routes/console/account/payments/editPaymentModal.svelte +++ b/src/routes/console/account/payments/editPaymentModal.svelte @@ -1,30 +1,47 @@ diff --git a/src/routes/console/organization-[organization]/usage/[[period]]/+page.ts b/src/routes/console/organization-[organization]/usage/[[period]]/+page.ts index 36014e5a3..7273b97b7 100644 --- a/src/routes/console/organization-[organization]/usage/[[period]]/+page.ts +++ b/src/routes/console/organization-[organization]/usage/[[period]]/+page.ts @@ -5,6 +5,6 @@ export const load: PageLoad = async ({ params }) => { const usage = await sdk.forConsole.billing.listUsage(params.organization); console.log(usage); return { - usage + aggregationList: usage }; };