From 996b85f3c8d2da4b7b1d6ea4fbc8cab8f004544f Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:47:58 +0000 Subject: [PATCH 1/4] fix: missing org settings --- src/routes/console/organization-[organization]/header.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index 23c2d23d8c..0dca9c0e3c 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -78,7 +78,7 @@ }, ...permanentTabSettings ] - : permanentTabs; + : [...permanentTabs, ...permanentTabSettings]; {#if $organization?.$id} From 28e5d363e42782540dec81270202b5413ec272be Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:29:45 +0000 Subject: [PATCH 2/4] fix: queries type --- src/lib/sdk/billing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index d3612312f4..44227042e3 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -849,7 +849,7 @@ export class Billing { ); } - async listAddresses(queries: Query[] = []): Promise { + async listAddresses(queries: string[] = []): Promise { const path = `/account/billing-addresses`; const params = { queries From 5b369882f8e35d2b38bcf2567a91b5ccb0b1652b Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:39:29 +0000 Subject: [PATCH 3/4] fix: invoices on selfhosted --- .../console/organization-[organization]/settings/+page.svelte | 4 +++- .../console/organization-[organization]/settings/+page.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index 8407543078..4b09765eee 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -99,4 +99,6 @@ {/if} - +{#if isCloud && data.invoices} + +{/if} diff --git a/src/routes/console/organization-[organization]/settings/+page.ts b/src/routes/console/organization-[organization]/settings/+page.ts index f4db3678f7..c3d520eb26 100644 --- a/src/routes/console/organization-[organization]/settings/+page.ts +++ b/src/routes/console/organization-[organization]/settings/+page.ts @@ -2,12 +2,14 @@ import type { PageLoad } from './$types'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; +import { isCloud } from '$lib/system'; export const load: PageLoad = async ({ depends, parent }) => { const { organization } = await parent(); depends(Dependencies.ORGANIZATION); + return { projects: await sdk.forConsole.projects.list([Query.equal('teamId', organization.$id)]), - invoices: await sdk.forConsole.billing.listInvoices(organization.$id) + invoices: isCloud ? await sdk.forConsole.billing.listInvoices(organization.$id) : undefined }; }; From bc8a53b4d789876399685fa9ed1a182a9ce00017 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:42:03 +0000 Subject: [PATCH 4/4] fix: remove unused var --- src/lib/sdk/billing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index 44227042e3..e6f91c83b9 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -1,4 +1,4 @@ -import type { Client, Models, Query } from '@appwrite.io/console'; +import type { Client, Models } from '@appwrite.io/console'; import type { Organization } from '../stores/organization'; import type { PaymentMethod } from '@stripe/stripe-js'; import type { Tier } from '$lib/stores/billing';