From 134b153c86f8ebf2d679a9b1eb66448187ff4a86 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 19 Jul 2023 12:13:42 +0200 Subject: [PATCH] feat: move invoices into billing tab --- src/lib/constants.ts | 1 + src/lib/sdk/billing.ts | 7 +- src/lib/system.ts | 1 - .../billing/+page.svelte | 2 + .../billing/+page.ts | 8 +- .../billing/paymentHistory.svelte | 122 ++++++++++++++++++ .../billing/store.ts | 7 +- .../organization-[organization]/header.svelte | 5 - .../invoices/+page.svelte | 103 --------------- .../invoices/+page.ts | 23 ---- .../usage/[[period]]/+page.svelte | 2 +- 11 files changed, 144 insertions(+), 137 deletions(-) create mode 100644 src/routes/console/organization-[organization]/billing/paymentHistory.svelte delete mode 100644 src/routes/console/organization-[organization]/invoices/+page.svelte delete mode 100644 src/routes/console/organization-[organization]/invoices/+page.ts diff --git a/src/lib/constants.ts b/src/lib/constants.ts index ac2fd1ac7..c945a9ea9 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -4,6 +4,7 @@ export const INTERVAL = 5 * 60000; // default interval to check for feedback export enum Dependencies { CREDIT = 'dependency:credit', + INVOICES = 'dependency:invoices', PAYMENT_METHODS = 'dependency:paymentMethods', ORGANIZATION = 'dependency:organization', PROJECT = 'dependency:project', diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index c56c93081..d75b65749 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -19,11 +19,16 @@ export type PaymentList = { export type Invoice = { $id: string; + $createdAt: Date; + $updatedAt: Date; + teamId: string; + aggregationId: string; amount: number; currency: string; date: number; + from: string; + to: string; status: string; - paymentMethod: PaymentMethodData; }; export type InvoiceList = { diff --git a/src/lib/system.ts b/src/lib/system.ts index cca9b13c8..5872961b6 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -9,7 +9,6 @@ export const VARS = { | string | undefined, CONSOLE_MODE: import.meta.env?.VITE_CONSOLE_MODE?.toString() as string | undefined, - CONSOLE_TIER: import.meta.env?.VITE_CONSOLE_TIER?.toString() as string | undefined, VERCEL_ENV: import.meta.env?.VITE_VERCEL_ENV?.toString() as string | undefined, GOOGLE_ANALYTICS: import.meta.env?.VITE_GA_PROJECT?.toString() as string | undefined, STRIPE_PUBLIC_KEY: import.meta.env?.VITE_STRIPE_PUBLIC_KEY?.toString() as string | undefined diff --git a/src/routes/console/organization-[organization]/billing/+page.svelte b/src/routes/console/organization-[organization]/billing/+page.svelte index 3424bb953..f9135f2a1 100644 --- a/src/routes/console/organization-[organization]/billing/+page.svelte +++ b/src/routes/console/organization-[organization]/billing/+page.svelte @@ -7,10 +7,12 @@ import BillingAddress from './billingAddress.svelte'; import PaymentMethods from './paymentMethods.svelte'; import AvailableCredit from './availableCredit.svelte'; + import PaymentHistory from './paymentHistory.svelte'; + diff --git a/src/routes/console/organization-[organization]/billing/+page.ts b/src/routes/console/organization-[organization]/billing/+page.ts index 5d95451d4..7fe1526ce 100644 --- a/src/routes/console/organization-[organization]/billing/+page.ts +++ b/src/routes/console/organization-[organization]/billing/+page.ts @@ -1,14 +1,20 @@ import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; +import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { await parent(); depends(Dependencies.PAYMENT_METHODS); depends(Dependencies.ORGANIZATION); + depends(Dependencies.CREDIT); + depends(Dependencies.INVOICES); return { paymentMethods: await sdk.forConsole.billing.listPaymentMethods(), - creditList: await sdk.forConsole.billing.listCredits(params.organization) + creditList: await sdk.forConsole.billing.listCredits(params.organization), + invoiceList: await sdk.forConsole.billing.listInvoices(params.organization, [ + Query.limit(5) + ]) }; }; diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte new file mode 100644 index 000000000..bc083aab0 --- /dev/null +++ b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte @@ -0,0 +1,122 @@ + + + + Payment history + +

+ Transaction history for this Organization. Download invoices for more details about your + payments. +

+ + {#if $invoiceList.total} + + + Date + Status + Amount Due + Invoce # + + + + {#each $invoiceList?.invoices as invoice, i} + + {toLocaleDate(invoice.from)} + + test + + {invoice.amount} + {invoice.aggregationId} + + + + + + { + selectedInvoice = invoice.$id; + view(); + }}> + View invoice + + { + selectedInvoice = invoice.$id; + download(); + }}>Download PDF + + + + + {/each} + +
+
+

Total results: {$invoiceList?.total}

+ +
+ {:else} + +

+ You have no payment history. After you receive your first invoice, you'll see it + here. +

+
+ {/if} +
+
diff --git a/src/routes/console/organization-[organization]/billing/store.ts b/src/routes/console/organization-[organization]/billing/store.ts index d42d380c1..55e956280 100644 --- a/src/routes/console/organization-[organization]/billing/store.ts +++ b/src/routes/console/organization-[organization]/billing/store.ts @@ -1,4 +1,7 @@ import { page } from '$app/stores'; -import { derived } from 'svelte/store'; +import type { CreditList, InvoiceList } from '$lib/sdk/billing'; +import { derived, type Readable } from 'svelte/store'; -export const creditList = derived(page, ($page) => $page.data.creditList); +export const creditList: Readable = derived(page, ($page) => $page.data.creditList); + +export const invoiceList: Readable = derived(page, ($page) => $page.data.invoiceList); diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index 8d429770e..5ee862f8d 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -61,11 +61,6 @@ href: `${path}/billing`, event: 'billing', title: 'Billing' - }, - { - href: `${path}/invoices`, - event: 'invoices', - title: 'Invoices' } ] : permanentTabs; diff --git a/src/routes/console/organization-[organization]/invoices/+page.svelte b/src/routes/console/organization-[organization]/invoices/+page.svelte deleted file mode 100644 index 90b0e423c..000000000 --- a/src/routes/console/organization-[organization]/invoices/+page.svelte +++ /dev/null @@ -1,103 +0,0 @@ - - - -
- Invoices -
- {#if data?.invoices?.total} - - - Date - Status - Amount Due - Invoce # - - - - {#each data.invoices?.invoices as invoice, i} - - test - - test - - {invoice} - test - - - - - { - selectedInvoice = invoice.$id; - view(); - }}> - View invoice - - { - selectedInvoice = invoice.$id; - download(); - }}>Download PDF - - - - - {/each} - - -
-

Total results: {data.invoices?.total}

- -
- {:else} - - You have no payment history. After you receive your first invoice, you'll see it here. - - {/if} -
diff --git a/src/routes/console/organization-[organization]/invoices/+page.ts b/src/routes/console/organization-[organization]/invoices/+page.ts deleted file mode 100644 index 3e3ee76a8..000000000 --- a/src/routes/console/organization-[organization]/invoices/+page.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Query } from '@appwrite.io/console'; -import { sdk } from '$lib/stores/sdk'; -import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; -import { PAGE_LIMIT } from '$lib/constants'; -import type { PageLoad } from './$types'; - -export const load: PageLoad = async ({ params, url, route }) => { - const page = getPage(url); - const limit = getLimit(url, route, PAGE_LIMIT); - const offset = pageToOffset(page, PAGE_LIMIT); - - const invoices = await sdk.forConsole.billing.listInvoices(params.organization, [ - Query.offset(offset), - Query.limit(limit), - Query.orderDesc('$createdAt') - ]); - - console.log(invoices); - return { - offset, - invoices - }; -}; diff --git a/src/routes/console/organization-[organization]/usage/[[period]]/+page.svelte b/src/routes/console/organization-[organization]/usage/[[period]]/+page.svelte index b144230aa..a5f97bdaa 100644 --- a/src/routes/console/organization-[organization]/usage/[[period]]/+page.svelte +++ b/src/routes/console/organization-[organization]/usage/[[period]]/+page.svelte @@ -2,7 +2,7 @@ import { Container } from '$lib/layout'; import { CardGrid, Heading, ProgressBarBig, ProjectUsage } from '$lib/components'; - export let data; + // export let data;