From d1df661f7e3493cda55b0b11eb02d91efa49d0bd Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 7 Dec 2023 12:18:51 +0100 Subject: [PATCH 1/2] link --- .../wizard/cloudOrganizationChangeTier/planExcess.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte index 2e98284cd..593ff46b1 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte @@ -53,7 +53,7 @@ - + From 8428c2db5c4812aa6ae8ae627b2da098a28ce0f8 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 7 Dec 2023 13:02:39 +0100 Subject: [PATCH 2/2] fix: QA --- .../console/account/payments/addressModal.svelte | 3 +-- .../console/account/payments/editAddressModal.svelte | 3 +-- .../billing/addCreditModal.svelte | 12 +++++------- .../wizard/cloudOrganization/addressDetails.svelte | 3 +-- .../wizard/cloudOrganization/paymentDetails.svelte | 4 ++++ .../addressDetails.svelte | 3 +-- .../paymentDetails.svelte | 4 ++++ 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/routes/console/account/payments/addressModal.svelte b/src/routes/console/account/payments/addressModal.svelte index 437a8508f..1c3867ddb 100644 --- a/src/routes/console/account/payments/addressModal.svelte +++ b/src/routes/console/account/payments/addressModal.svelte @@ -112,8 +112,7 @@ bind:value={zip} id="zip" label="Postal code" - placeholder="Enter postal code" - required /> + placeholder="Enter postal code" /> diff --git a/src/routes/console/account/payments/editAddressModal.svelte b/src/routes/console/account/payments/editAddressModal.svelte index ee3d5c8d6..3ad0772d9 100644 --- a/src/routes/console/account/payments/editAddressModal.svelte +++ b/src/routes/console/account/payments/editAddressModal.svelte @@ -96,8 +96,7 @@ bind:value={selectedAddress.postalCode} id="zip" label="Postal code" - placeholder="Enter postal code" - required /> + placeholder="Enter postal code" /> diff --git a/src/routes/console/organization-[organization]/billing/addCreditModal.svelte b/src/routes/console/organization-[organization]/billing/addCreditModal.svelte index 031936529..f0bb10ba9 100644 --- a/src/routes/console/organization-[organization]/billing/addCreditModal.svelte +++ b/src/routes/console/organization-[organization]/billing/addCreditModal.svelte @@ -12,6 +12,7 @@ const dispatch = createEventDispatcher(); export let show = false; let coupon: string = null; + let error: string = null; async function redeem() { try { @@ -28,17 +29,14 @@ }); coupon = null; dispatch('success'); - } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); - trackError(error, Submit.CreditRedeem); + } catch (e) { + error = e.message; + trackError(e, Submit.CreditRedeem); } } - + Apply Appwrite credits to your organization. diff --git a/src/routes/console/wizard/cloudOrganization/addressDetails.svelte b/src/routes/console/wizard/cloudOrganization/addressDetails.svelte index 12fb96578..b14c1f631 100644 --- a/src/routes/console/wizard/cloudOrganization/addressDetails.svelte +++ b/src/routes/console/wizard/cloudOrganization/addressDetails.svelte @@ -105,8 +105,7 @@ bind:value={$createOrganization.billingAddress.postalCode} id="zip" label="Postal code" - placeholder="Enter postal code" - required /> + placeholder="Enter postal code" /> diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte index 535b3cb7a..8819cbbe6 100644 --- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte +++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte @@ -27,6 +27,9 @@ }); async function handleSubmit() { + if ($createOrganization.billingBudget < 0) { + throw new Error('Budget cannot be negative'); + } try { const method = await submitStripeCard(name); $createOrganization.paymentMethodId = method.$id; @@ -83,6 +86,7 @@ id="budget" label="Budget cap ($USD)" placeholder="0" + min={0} bind:value={$createOrganization.billingBudget} /> {/if} diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte index df209ab5a..f05c89b0d 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte @@ -108,8 +108,7 @@ bind:value={$changeOrganizationTier.billingAddress.postalCode} id="zip" label="Postal code" - placeholder="Enter postal code" - required /> + placeholder="Enter postal code" /> diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte index 3c71613f0..d0461c61f 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte @@ -33,6 +33,10 @@ }); async function handleSubmit() { + if ($changeOrganizationTier.billingBudget < 0) { + throw new Error('Budget cannot be negative'); + } + try { await submitStripeCard(name); const latestMethods = await sdk.forConsole.billing.listPaymentMethods();