method.$id === $organization?.paymentMethodId
@@ -76,13 +79,27 @@
{#if $failedInvoice}
-
-
- 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.
-
+ {#if $failedInvoice?.lastError}
+
+ The scheduled payment for {$organization.name} failed due to following error: {$failedInvoice.lastError}
+
+
+
+
+ {:else}
+
+
+ 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.
+
+ {/if}
{/if}
{#if defaultPaymentMethod?.failed && !backupPaymentMethod}
@@ -95,9 +112,8 @@
{/if}
{#if $organization?.billingPlanDowngrade}
- Your organization will change to a Starter plan once your current billing cycle ends on {toLocaleDate(
- $organization.billingNextInvoiceDate
- )}.
+ Your organization will change to a Starter plan once your current billing cycle ends and
+ your invoice is paid on {toLocaleDate($organization.billingNextInvoiceDate)}.
{/if}
- The {isBackup ? 'backup' : 'default'} payment method cannot be deleted as
+ The {isBackup ? 'backup' : 'default'} payment method cannot be removed as
{$organization?.name}
- has an upcoming invoice. To proceed with deletion, set a {isBackup
- ? 'default'
- : 'backup'} or add a new {isBackup ? 'backup' : 'default'} payment method.
+ has an upcoming invoice. To proceed, set a {isBackup ? 'default' : 'backup'} or add a new
+ {isBackup ? 'backup' : 'default'} payment method.
- Are you sure you want to delete the payment method from {$organization?.name}?
+ Are you sure you want to remove the payment method from {$organization?.name}?
-
+
{/if}
diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte
index a8caf4348..8339ac60b 100644
--- a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte
+++ b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte
@@ -22,7 +22,7 @@
} from '$lib/elements/table';
import { toLocaleDate } from '$lib/helpers/date';
import { formatCurrency } from '$lib/helpers/numbers';
- import type { InvoiceList } from '$lib/sdk/billing';
+ import type { Invoice, InvoiceList } from '$lib/sdk/billing';
import { sdk } from '$lib/stores/sdk';
import { VARS } from '$lib/system';
import { Query } from '@appwrite.io/console';
@@ -31,6 +31,7 @@
import { selectedInvoice, showRetryModal } from './store';
let showDropdown = [];
+ let showFailedError = false;
let offset = 0;
let invoiceList: InvoiceList = {
@@ -51,6 +52,11 @@
]);
}
+ function retryPayment(invoice: Invoice) {
+ $selectedInvoice = invoice;
+ $showRetryModal = true;
+ }
+
$: if (offset !== null) {
request();
}
@@ -82,14 +88,45 @@
-
- {status === 'requires_authentication' ? 'failed' : status}
-
+ {#if invoice?.lastError}
+
+ (showFailedError = true)}
+ button>
+ {status === 'requires_authentication'
+ ? 'failed'
+ : status}
+
+
+
- Calculated for all bandwidth used across all projects in your organization.
+ Calculated for all bandwidth used across all projects in your organization. Resets at
+ the start of each billing cycle.
This amount, and any additional usage fees, will be charged on a recurring 30-day
- billing cycle after your trial period ends on {toLocaleDate(billingPayDate.toString())}.
+ billing cycle{!plan.trialDays
+ ? ''
+ : ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}.
- 14 DAY FREE TRIAL
+ {#if proPlan?.trialDays}
+ 14 DAY FREE TRIAL
+ {/if}
@@ -131,7 +133,6 @@
-
COMING SOON
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
index b9378f5f1..956064b66 100644
--- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
@@ -10,7 +10,7 @@
import { initializeStripe, isStripeInitialized, submitStripeCard } from '$lib/stores/stripe';
import { sdk } from '$lib/stores/sdk';
import { toLocaleDate } from '$lib/helpers/date';
- import { showUsageRatesModal } from '$lib/stores/billing';
+ import { plansInfo, showUsageRatesModal } from '$lib/stores/billing';
import { PaymentBoxes } from '$lib/components/billing';
const today = new Date();
@@ -74,9 +74,11 @@
Payment details
- Add a payment method to your organization. You will not be charged until your trial ends on {toLocaleDate(billingPayDate.toString())}.
+ Add a payment method to your organization. {#if $plansInfo.get($createOrganization.billingPlan)?.trialDays}You
+ will not be charged until your trial ends on {toLocaleDate(billingPayDate.toString())}.
+ {/if}
diff --git a/src/routes/console/wizard/cloudOrganization/store.ts b/src/routes/console/wizard/cloudOrganization/store.ts
index 613259fe0..55a53175c 100644
--- a/src/routes/console/wizard/cloudOrganization/store.ts
+++ b/src/routes/console/wizard/cloudOrganization/store.ts
@@ -1,10 +1,10 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import type { Tier } from '$lib/stores/billing';
+import { type Tier } from '$lib/stores/billing';
import { writable } from 'svelte/store';
export const createOrgSteps = writable(new Map());
-export const createOrganizationFinalAction = writable('Start trial');
+export const createOrganizationFinalAction = writable('Create');
export const createOrganization = writable<{
id?: string;
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
index 2327bd948..77430ca0d 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
@@ -161,8 +161,8 @@
{#if $organization.billingPlan === BillingPlan.PRO}
CURRENT PLAN
- {:else}
- 14 DAY FREE TRIAL
+ {:else if proPlan?.trialDays}
+ {proPlan?.trialDays} DAY FREE TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
index cc487c579..51ee8aeed 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -49,6 +49,10 @@
$: if (!$isUpgrade) {
$changeOrganizationFinalAction = 'Confirm plan change';
}
+
+ $: if (plan?.trialDays) {
+ $changeOrganizationFinalAction = 'Start trial';
+ }
{#if downgradeToStarter}
@@ -77,7 +81,11 @@
Details
- Confirm the details of your new organization and start your free trial.
+ Confirm the details of your new organization{!$plansInfo.get(
+ $changeOrganizationTier.billingPlan
+ )?.trialDays
+ ? '.'
+ : ' and start your free trial.'}
Organization name
@@ -144,9 +152,9 @@
This amount, and any additional usage fees, will be charged on a recurring 30-day
- billing cycle after your trial period ends on {toLocaleDate(billingPayDate.toString())}.
+ billing cycle{!$plansInfo.get($changeOrganizationTier.billingPlan)?.trialDays
+ ? ''
+ : ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}.
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
index 846dbabcc..57463d106 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
@@ -1,11 +1,11 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import type { Tier } from '$lib/stores/billing';
+import { type Tier } from '$lib/stores/billing';
import { writable } from 'svelte/store';
export const changeTierSteps = writable(new Map());
export const isUpgrade = writable(false);
-export const changeOrganizationFinalAction = writable('Start trial');
+export const changeOrganizationFinalAction = writable('Create');
export const changeOrganizationTier = writable<{
billingPlan: Tier;