From fc68a2a6c441d992382c86f93e5f96d6bcb24afe Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 31 Oct 2023 18:17:11 +0100 Subject: [PATCH] fix: QA --- src/lib/elements/flag.svelte | 25 ++++++++++++++++ src/lib/elements/index.ts | 1 + src/lib/stores/organization.ts | 2 +- .../account/payments/addressModal.svelte | 2 ++ .../organization-[organization]/+page.svelte | 22 +++++++++++--- .../billing/billingAddress.svelte | 15 ++++++++-- .../billing/paymentMethods.svelte | 29 ++++++++++++++++--- 7 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 src/lib/elements/flag.svelte diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte new file mode 100644 index 000000000..fd5719d93 --- /dev/null +++ b/src/lib/elements/flag.svelte @@ -0,0 +1,25 @@ + + +{name} diff --git a/src/lib/elements/index.ts b/src/lib/elements/index.ts index ffd1477bb..dabf2f27b 100644 --- a/src/lib/elements/index.ts +++ b/src/lib/elements/index.ts @@ -1,2 +1,3 @@ export { default as Pill } from './pill.svelte'; export { default as SelectSearchItem } from './selectSearchItem.svelte'; +export { default as Flag } from './flag.svelte'; diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 6a8c51741..342b8dec5 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -14,7 +14,7 @@ export type Organization = Models.Team> & { billingNextInvoiceDate: string; billingTrialStartDate?: string; billingTrialDays?: number; - billingAddress?: string; + billingAddressId?: string; amount: number; taxId?: string; }; diff --git a/src/routes/console/account/payments/addressModal.svelte b/src/routes/console/account/payments/addressModal.svelte index 1ada308c0..dff568ee3 100644 --- a/src/routes/console/account/payments/addressModal.svelte +++ b/src/routes/console/account/payments/addressModal.svelte @@ -49,8 +49,10 @@ trackEvent(Submit.BillingAddressCreate); let org: Organization = null; if (organization) { + console.log(response); org = await sdk.forConsole.billing.setBillingAddress(organization, response.$id); trackEvent(Submit.OrganizationBillingAddressUpdate); + console.log(org); } await invalidate(Dependencies.ADDRESS); show = false; diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte index 65546ba06..75ae18db9 100644 --- a/src/routes/console/organization-[organization]/+page.svelte +++ b/src/routes/console/organization-[organization]/+page.svelte @@ -1,6 +1,6 @@ @@ -173,9 +180,16 @@ +{project.platforms.length - 3} {/if} - - {#if isCloud} -

region

+ + {#if isCloud && regions} + {@const region = regions.regions.find( + (region) => region.$id === project.region + )} + +
+ {region.name} + +
{/if}
diff --git a/src/routes/console/organization-[organization]/billing/billingAddress.svelte b/src/routes/console/organization-[organization]/billing/billingAddress.svelte index a71b3f3e2..653371d42 100644 --- a/src/routes/console/organization-[organization]/billing/billingAddress.svelte +++ b/src/routes/console/organization-[organization]/billing/billingAddress.svelte @@ -34,7 +34,7 @@ } $: billingAddress = $addressList?.billingAddresses?.find( - (address) => address.$id === $organization?.billingAddress + (address) => address.$id === $organization?.billingAddressId ); @@ -46,7 +46,7 @@ Appwrite.

- {#if $organization?.billingAddress && billingAddress} + {#if $organization?.billingAddressId && billingAddress}
@@ -63,7 +63,16 @@
- diff --git a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte b/src/routes/console/organization-[organization]/billing/paymentMethods.svelte index ba3ce2a9d..b0791e636 100644 --- a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentMethods.svelte @@ -142,16 +142,28 @@ {:else} + {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter( + (o) => !!o.last4 && o.$id !== $organization.backupPaymentMethodId + )}
- {#if $paymentMethods.total} - {#each $paymentMethods.paymentMethods.filter((o) => !!o.last4 && o.$id !== $organization.backupPaymentMethodId) as paymentMethod} + {#each filteredPaymentMethods as paymentMethod} { showDropdown = false; @@ -225,6 +237,9 @@ {:else} + {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter( + (o) => !!o.last4 && o.$id !== $organization.paymentMethodId + )}
@@ -232,12 +247,18 @@ {#if $paymentMethods.total} - {#each $paymentMethods.paymentMethods.filter((o) => !!o.last4 && o.$id !== $organization?.paymentMethodId) as paymentMethod} + {#each filteredPaymentMethods as paymentMethod} { showDropdownBackup = true;