From 02a6ba9567ec1c7ce591f941ad0557b70dbdc1d5 Mon Sep 17 00:00:00 2001 From: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com> Date: Thu, 3 Jul 2025 12:28:47 -0700 Subject: [PATCH 1/6] fix: undefined (reading 'name') on billing page Because of plansInfo.get(), aggregationBillingPlan was undefined for custom plans since they were not part of the billing.getPlansInfo() result. Instead, use the currentPlan that is already fetched from the parent layout. --- .../organization-[organization]/billing/+page.svelte | 2 +- .../(console)/organization-[organization]/billing/+page.ts | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index 59a4f64d9..1ee3264c2 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -130,7 +130,7 @@ Billing diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts index 3eba1d6c0..8fc2700b2 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.ts +++ b/src/routes/(console)/organization-[organization]/billing/+page.ts @@ -7,7 +7,7 @@ import type { PageLoad } from './$types'; import { isCloud } from '$lib/system'; export const load: PageLoad = async ({ parent, depends }) => { - const { organization, scopes, currentPlan, countryList, locale, plansInfo } = await parent(); + const { organization, scopes, currentPlan, countryList, locale } = await parent(); if (!scopes.includes('billing.read')) { return redirect(301, `/console/organization-${organization.$id}`); @@ -64,10 +64,6 @@ export const load: PageLoad = async ({ parent, depends }) => { areCreditsSupported ? sdk.forConsole.billing.getAvailableCredit(organization.$id) : null ]); - const aggregationBillingPlan = plansInfo.get( - billingAggregation?.plan ?? organization.billingPlan - ); - // make number const credits = availableCredit ? availableCredit.available : null; @@ -75,7 +71,6 @@ export const load: PageLoad = async ({ parent, depends }) => { paymentMethods, addressList, billingAddress, - aggregationBillingPlan, availableCredit: credits, billingAggregation, billingInvoice, From 63e93688f5d23a7566c62febb19a31d9fe4bea62 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 3 Jul 2025 17:58:48 -0700 Subject: [PATCH 2/6] fix: undefined (reading 'billingNextInvoiceDate') When moving to a page without $organization, org is undefined and results in this "undefined (reading 'billingNextInvoiceDate')" error. --- src/lib/stores/billing.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 0fc0d6dd9..5df55b9fd 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -287,6 +287,7 @@ export function checkForEnterpriseTrial(org: Organization) { } export function calculateEnterpriseTrial(org: Organization) { + if (!org || !org.billingNextInvoiceDate) return 0; const endDate = new Date(org.billingNextInvoiceDate); const startDate = new Date(org.billingCurrentInvoiceDate); const today = new Date(); From a66ef5ed9be98edfacff1348d1f89c8973b61a1d Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 3 Jul 2025 18:09:02 -0700 Subject: [PATCH 3/6] fix: undefined (reading 'budgeting') in budget cap --- .../billing/+page.svelte | 32 +++++++++---------- .../billing/budgetAlert.svelte | 30 ++++++++--------- .../billing/budgetCap.svelte | 31 ++++++++---------- 3 files changed, 44 insertions(+), 49 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index 1ee3264c2..ee169c683 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -1,6 +1,5 @@ @@ -93,7 +93,7 @@ {#if $failedInvoice} {#if $failedInvoice?.lastError} - The scheduled payment for {$organization.name} failed due to following error: {$failedInvoice.lastError} + The scheduled payment for {organization.name} failed due to following error: {$failedInvoice.lastError} + title={`The scheduled payment for ${organization.name} failed`}> To avoid service disruptions in organization's your projects, please verify your payment details and update them if necessary. @@ -115,16 +115,16 @@ {#if defaultPaymentMethod?.failed && !backupPaymentMethod} + title={`The default payment method for ${organization.name} has expired`}> To avoid service disruptions in your organization's projects, please update your payment details. {/if} - {#if $organization?.billingPlanDowngrade} + {#if organization?.billingPlanDowngrade} - Your organization has changed to {tierToPlan($organization?.billingPlanDowngrade).name} plan. - You will continue to have access to {tierToPlan($organization?.billingPlan).name} plan features - until your billing period ends on {toLocaleDate($organization.billingNextInvoiceDate)}. + Your organization has changed to {tierToPlan(organization?.billingPlanDowngrade).name} plan. + You will continue to have access to {tierToPlan(organization?.billingPlan).name} plan features + until your billing period ends on {toLocaleDate(organization.billingNextInvoiceDate)}. {/if} Billing @@ -137,7 +137,7 @@ - + diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte index 81a72d60b..5743273b9 100644 --- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte +++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte @@ -7,18 +7,20 @@ import { Button, Form } from '$lib/elements/forms'; import { symmetricDifference } from '$lib/helpers/array'; import { addNotification } from '$lib/stores/notifications'; - import { currentPlan, organization } from '$lib/stores/organization'; + import { type Organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; - import { onMount } from 'svelte'; import { Alert, Icon, Table } from '@appwrite.io/pink-svelte'; import { IconTrash } from '@appwrite.io/pink-icons-svelte'; import InputSelect from '$lib/elements/forms/inputSelect.svelte'; + import type { Plan } from '$lib/sdk/billing'; + export let organization: Organization; + export let currentPlan: Plan; export let alertsEnabled = false; let search: string; let selectedAlert: number; - let alerts: number[] = []; + let alerts: number[] = organization?.budgetAlerts ?? []; $: options = [ { value: 25, label: '25%', disabled: false }, @@ -33,10 +35,6 @@ }; }); - onMount(() => { - alerts = $organization?.budgetAlerts ?? []; - }); - function addAlert() { if (alerts.some((alert) => alert === selectedAlert)) { return; @@ -50,8 +48,8 @@ async function updateBudget() { try { await sdk.forConsole.billing.updateBudget( - $organization.$id, - $organization.billingBudget, + organization.$id, + organization.billingBudget, alerts ); @@ -60,7 +58,7 @@ addNotification({ type: 'success', isHtml: true, - message: ` ${alerts.length === 0 ? 'Budget alerts removed from' : alerts.length > 1 ? `Budget alerts added to` : 'A budget alert has been added to'} ${$organization.name} ` + message: ` ${alerts.length === 0 ? 'Budget alerts removed from' : alerts.length > 1 ? `Budget alerts added to` : 'A budget alert has been added to'} ${organization.name} ` }); trackEvent(Submit.BudgetAlertsUpdate, { alerts @@ -75,26 +73,26 @@ } $: isButtonDisabled = - symmetricDifference(alerts, $organization.budgetAlerts).length === 0 || !alertsEnabled; + symmetricDifference(alerts, organization.budgetAlerts).length === 0 || !alertsEnabled; Billing alerts - {#if !$currentPlan.budgeting} + {#if !currentPlan.budgeting} Get notified by email when your organization meets a percentage of your budget cap. {tierToPlan($organization.billingPlan).name} organizations will receive one notification + >{tierToPlan(organization.billingPlan).name} organizations will receive one notification at 75% resource usage. {:else} Get notified by email when your organization meets or exceeds a percentage of your specified billing alert(s). {/if} - {#if !$currentPlan.budgeting} + {#if !currentPlan.budgeting} Upgrade to a Pro plan to manage when you receive billing alerts for your organization. - {:else if !$currentPlan.budgetCapEnabled} + {:else if !currentPlan.budgetCapEnabled} Budget caps are not supported on your current plan. For more information, please reach out to your customer success manager. @@ -150,7 +148,7 @@ - {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION} + {#if organization?.billingPlan === BillingPlan.FREE || organization?.billingPlan === BillingPlan.GITHUB_EDUCATION} { - budget = $organization?.billingBudget; - capActive = $organization?.billingBudget !== null; - }); + export let currentPlan: Plan; + export let organization: Organization; + let capActive = organization?.billingBudget !== null; + let budget = organization.billingBudget; async function updateBudget() { try { await sdk.forConsole.billing.updateBudget( - $organization.$id, + organization.$id, budget, - $organization.budgetAlerts + organization.budgetAlerts ); await invalidate(Dependencies.ORGANIZATION); addNotification({ type: 'success', - message: `Budget cap enabled for ${$organization.name}` + message: `Budget cap enabled for ${organization.name}` }); trackEvent(Submit.BudgetCapUpdate, { budget: capActive ? budget : undefined @@ -55,7 +52,7 @@ Restrict your resource usage by setting a budget cap. Cap usage is reset at the beginning of each billing cycle. - {#if !$currentPlan.budgeting} + {#if !currentPlan.budgeting} Upgrade to a Pro plan to set a budget cap for your organization. For more information on what you can do with a Pro plan, @@ -64,7 +61,7 @@ target="_blank" rel="noopener noreferrer">view our pricing guide. - {:else if !$currentPlan.budgetCapEnabled} + {:else if !currentPlan.budgetCapEnabled} Budget caps are not supported on your current plan. For more information, please reach out to your customer success manager. @@ -92,7 +89,7 @@ - {#if $organization?.billingPlan === BillingPlan.FREE} + {#if organization?.billingPlan === BillingPlan.FREE} Upgrade to Pro {:else} - Update + Update {/if} - 0} /> + 0} /> From 782e8e61cd07160b510f3c9307df005ba3511d66 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 3 Jul 2025 18:11:54 -0700 Subject: [PATCH 4/6] fix: undefined (reading 'paymentMethodId') in replace card --- .../billing/+page.svelte | 2 +- .../billing/paymentMethods.svelte | 37 ++++++++++--------- .../billing/replaceCard.svelte | 25 +++++++------ 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index ee169c683..0f47f01e2 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -134,7 +134,7 @@ currentAggregation={data?.billingAggregation} currentInvoice={data?.billingInvoice} /> - + diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte index b98c45bb2..14407a2e7 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte @@ -5,7 +5,7 @@ import { CardGrid, CreditCardBrandImage, CreditCardInfo } from '$lib/components'; import { BillingPlan, Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; - import { organization } from '$lib/stores/organization'; + import { type Organization } from '$lib/stores/organization'; import { Button } from '$lib/elements/forms'; import { hasStripePublicKey, isCloud } from '$lib/system'; import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing'; @@ -34,6 +34,7 @@ IconTrash } from '@appwrite.io/pink-icons-svelte'; + export let organization: Organization; export let methods: PaymentList; let showPayment = false; @@ -47,12 +48,12 @@ async function addPaymentMethod(paymentMethodId: string) { try { await sdk.forConsole.billing.setOrganizationPaymentMethod( - $organization.$id, + organization.$id, paymentMethodId ); addNotification({ type: 'success', - message: `A new payment method has been added to ${$organization.name}` + message: `A new payment method has been added to ${organization.name}` }); trackEvent(Submit.OrganizationPaymentUpdate); invalidate(Dependencies.ORGANIZATION); @@ -68,12 +69,12 @@ async function addBackupPaymentMethod(paymentMethodId: string) { try { await sdk.forConsole.billing.setOrganizationPaymentMethodBackup( - $organization.$id, + organization.$id, paymentMethodId ); addNotification({ type: 'success', - message: `A new payment method has been added to ${$organization.name}` + message: `A new payment method has been added to ${organization.name}` }); invalidate(Dependencies.ORGANIZATION); } catch (error) { @@ -85,15 +86,15 @@ } } - $: if ($organization?.backupPaymentMethodId) { + $: if (organization?.backupPaymentMethodId) { sdk.forConsole.billing - .getOrganizationPaymentMethod($organization.$id, $organization.backupPaymentMethodId) + .getOrganizationPaymentMethod(organization.$id, organization.backupPaymentMethodId) .then((res) => (backupPaymentMethod = res)); } - $: if ($organization?.paymentMethodId) { + $: if (organization?.paymentMethodId) { sdk.forConsole.billing - .getOrganizationPaymentMethod($organization.$id, $organization.paymentMethodId) + .getOrganizationPaymentMethod(organization.$id, organization.paymentMethodId) .then((res) => (defaultPaymentMethod = res)); } @@ -112,7 +113,7 @@ Payment methods View or update your organization payment methods here. - {#if $organization?.paymentMethodId} + {#if organization?.paymentMethodId} - {#if $organization?.backupPaymentMethodId} + {#if organization?.backupPaymentMethodId} @@ -209,9 +210,9 @@ {/if} - {#if !$organization?.backupPaymentMethodId} + {#if !organization?.backupPaymentMethodId} {@const filteredPaymentMethods = methods.paymentMethods.filter( - (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId + (o) => !!o.last4 && o.$id !== organization?.paymentMethodId )} @@ -264,7 +265,7 @@ {/if} {:else} {@const filteredPaymentMethods = methods.paymentMethods.filter( - (o) => !!o.last4 && o.$id !== $organization?.backupPaymentMethodId + (o) => !!o.last4 && o.$id !== organization?.backupPaymentMethodId )} @@ -319,15 +320,15 @@ bind:show={showEdit} /> {/if} {#if isCloud && hasStripePublicKey} - + {/if} {#if showDelete && isCloud && hasStripePublicKey} {@const hasOtherMethod = isSelectedBackup - ? !!$organization?.paymentMethodId - : !!$organization?.backupPaymentMethodId} + ? !!organization?.paymentMethodId + : !!organization?.backupPaymentMethodId} + disabled={organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod} /> {/if} diff --git a/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte index faf49fc8c..9adbb514e 100644 --- a/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte +++ b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte @@ -3,7 +3,7 @@ import { FakeModal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { sdk } from '$lib/stores/sdk'; - import { organization } from '$lib/stores/organization'; + import type { Organization } from '$lib/stores/organization'; import { Dependencies } from '$lib/constants'; import { submitStripeCard } from '$lib/stores/stripe'; import { onMount } from 'svelte'; @@ -12,6 +12,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { PaymentBoxes } from '$lib/components/billing'; + export let organization: Organization; export let show = false; export let isBackup = false; export let methods: PaymentList; @@ -21,12 +22,12 @@ let selectedPaymentMethodId: string; onMount(async () => { - if (!$organization.paymentMethodId && !$organization.backupPaymentMethodId) { + if (!organization.paymentMethodId && !organization.backupPaymentMethodId) { selectedPaymentMethodId = methods?.total ? methods.paymentMethods[0].$id : null; } else { selectedPaymentMethodId = isBackup - ? $organization.backupPaymentMethodId - : $organization.paymentMethodId; + ? organization.backupPaymentMethodId + : organization.paymentMethodId; // If the selected payment method does not belong to the current user, select the first one. if ( methods?.total && @@ -40,7 +41,7 @@ async function handleSubmit() { try { if (selectedPaymentMethodId === '$new') { - const method = await submitStripeCard(name, $organization.$id); + const method = await submitStripeCard(name, organization.$id); selectedPaymentMethodId = method.$id; } isBackup @@ -68,7 +69,7 @@ async function addPaymentMethod(paymentMethodId: string) { try { await sdk.forConsole.billing.setOrganizationPaymentMethod( - $organization.$id, + organization.$id, paymentMethodId ); } catch (e) { @@ -79,7 +80,7 @@ async function addBackupPaymentMethod(paymentMethodId: string) { try { await sdk.forConsole.billing.setOrganizationPaymentMethodBackup( - $organization.$id, + organization.$id, paymentMethodId ); } catch (e) { @@ -97,18 +98,18 @@ methods={filteredMethods} bind:name bind:group={selectedPaymentMethodId} - defaultMethod={$organization?.paymentMethodId} - backupMethod={$organization?.backupPaymentMethodId} + defaultMethod={organization?.paymentMethodId} + backupMethod={organization?.backupPaymentMethodId} disabledCondition={isBackup - ? $organization.paymentMethodId - : $organization.backupPaymentMethodId} /> + ? organization.paymentMethodId + : organization.backupPaymentMethodId} /> (show = false)}>Cancel + (isBackup ? organization.backupPaymentMethodId : organization.paymentMethodId)}> Save From 6867b353d6ee2c2e364aa1ed013afb127823b881 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 3 Jul 2025 21:39:53 -0700 Subject: [PATCH 5/6] chore: rename CREATE_ORGANIZATION dependency to ORGANIZATIONS ORGANIZATIONS is clearer because it refers to the resource for the dependency. So, any time the ORGANLIZATIONS (list) needs to be refreshed, the this dependency can be invalidated. --- src/lib/constants.ts | 2 +- src/routes/(console)/create-organization/+page.ts | 2 +- .../(console)/onboarding/create-organization/+page.svelte | 2 +- src/routes/+layout.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index cd9dc4364..7414a2ffa 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -18,7 +18,7 @@ export enum Dependencies { INVOICES = 'dependency:invoices', ADDRESS = 'dependency:address', UPGRADE_PLAN = 'dependency:upgrade_plan', - CREATE_ORGANIZATION = 'dependency:create_organization', + ORGANIZATIONS = 'dependency:organizations', PAYMENT_METHODS = 'dependency:paymentMethods', ORGANIZATION = 'dependency:organization', MEMBERS = 'dependency:members', diff --git a/src/routes/(console)/create-organization/+page.ts b/src/routes/(console)/create-organization/+page.ts index 9aba3aefd..690baa2bb 100644 --- a/src/routes/(console)/create-organization/+page.ts +++ b/src/routes/(console)/create-organization/+page.ts @@ -6,7 +6,7 @@ import type { Organization } from '$lib/stores/organization'; export const load: PageLoad = async ({ url, parent, depends }) => { const { organizations } = await parent(); - depends(Dependencies.CREATE_ORGANIZATION); + depends(Dependencies.ORGANIZATIONS); const [coupon, paymentMethods] = await Promise.all([ getCoupon(url), diff --git a/src/routes/(console)/onboarding/create-organization/+page.svelte b/src/routes/(console)/onboarding/create-organization/+page.svelte index b765cbd6a..b29ff6f44 100644 --- a/src/routes/(console)/onboarding/create-organization/+page.svelte +++ b/src/routes/(console)/onboarding/create-organization/+page.svelte @@ -50,7 +50,7 @@ // fixes an edge case where // the org is not available for some reason! - await invalidate(Dependencies.CREATE_ORGANIZATION); + await invalidate(Dependencies.ORGANIZATIONS); } isLoading = false; } diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 21fe42dde..46b84cc98 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -16,7 +16,7 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url, route }) => { depends(Dependencies.ACCOUNT); - depends(Dependencies.CREATE_ORGANIZATION); + depends(Dependencies.ORGANIZATIONS); const [account, error] = (await sdk.forConsole.account .get() From 1a296a219560aad310a948c1a9a2b539ff681197 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 3 Jul 2025 18:15:57 -0700 Subject: [PATCH 6/6] fix: ensure billing address on the org and account page updates --- .../account/payments/addressModal.svelte | 2 +- .../billing/+page.svelte | 6 ++++- .../billing/billingAddress.svelte | 23 ++++++++----------- .../billing/removeAddress.svelte | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte index 4c64e3cf1..9bdcc2784 100644 --- a/src/routes/(console)/account/payments/addressModal.svelte +++ b/src/routes/(console)/account/payments/addressModal.svelte @@ -56,7 +56,7 @@ if (organization) { org = await sdk.forConsole.billing.setBillingAddress(organization, response.$id); trackEvent(Submit.OrganizationBillingAddressUpdate); - await invalidate(Dependencies.ORGANIZATION); + await invalidate(Dependencies.ORGANIZATIONS); } await invalidate(Dependencies.ADDRESS); diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index 0f47f01e2..ae2674465 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -135,7 +135,11 @@ currentInvoice={data?.billingInvoice} /> - + diff --git a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte index d8b387781..d71d9e576 100644 --- a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte +++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte @@ -7,7 +7,7 @@ import type { Address } from '$lib/sdk/billing'; import { addressList } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; - import { organization } from '$lib/stores/organization'; + import { type Organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; import RemoveAddress from './removeAddress.svelte'; import { user } from '$lib/stores/user'; @@ -23,14 +23,11 @@ IconTrash } from '@appwrite.io/pink-icons-svelte'; import type { Models } from '@appwrite.io/console'; - import type { PageData } from './$types'; - export let data: PageData; - - const locale: Models.Locale = data.locale; - const countryList: Models.CountryList = data.countryList; - - let billingAddress: Address = data?.billingAddress; + export let organization: Organization; + export let locale: Models.Locale; + export let countryList: Models.CountryList; + export let billingAddress: Address; let showCreate = false; let showEdit = false; @@ -39,16 +36,16 @@ async function addAddress(addressId: string) { try { - await sdk.forConsole.billing.setBillingAddress($organization.$id, addressId); + await sdk.forConsole.billing.setBillingAddress(organization.$id, addressId); addNotification({ type: 'success', - message: `A new billing address has been added to ${$organization.name}` + message: `A new billing address has been added to ${organization.name}` }); trackEvent(Submit.OrganizationBillingAddressUpdate); invalidate(Dependencies.ADDRESS); - invalidate(Dependencies.ORGANIZATION); + invalidate(Dependencies.ORGANIZATIONS); } catch (error) { addNotification({ type: 'error', @@ -63,7 +60,7 @@ Billing address View or update your billing address. This address will be included in your invoices from Appwrite. - {#if $organization?.billingAddressId && billingAddress} + {#if organization?.billingAddressId && billingAddress} @@ -140,7 +137,7 @@ {#if showCreate} - + {/if} {#if showEdit}