diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 6e2bf1345..ddaaba7af 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -261,6 +261,7 @@ export type Plan = {
storage: AdditionalResource;
users: AdditionalResource;
};
+ trialDays: number;
};
export type PlansInfo = {
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index ad4d7c0ab..ae26c1815 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -21,7 +21,8 @@
paymentExpired,
checkForMarkedForDeletion,
checkForMandate,
- checkForMissingPaymentMethod
+ checkForMissingPaymentMethod,
+ plansInfo
} from '$lib/stores/billing';
import { goto } from '$app/navigation';
import { CommandCenter, registerCommands, registerSearchers } from '$lib/commandCenter';
@@ -269,10 +270,12 @@
await checkForUsageLimit(org);
checkForMarkedForDeletion(org);
if (org?.billingPlan !== BillingPlan.STARTER) {
- calculateTrialDay(org);
await paymentExpired(org);
await checkPaymentAuthorizationRequired(org);
await checkForMandate(org);
+ if ($plansInfo.get(org.billingPlan)?.trialDays) {
+ calculateTrialDay(org);
+ }
}
$activeHeaderAlert = headerAlert.get();
}
diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte
index 0216b5621..33811a134 100644
--- a/src/routes/console/account/organizations/+page.svelte
+++ b/src/routes/console/account/organizations/+page.svelte
@@ -17,7 +17,7 @@
import { Pill } from '$lib/elements';
import type { Models } from '@appwrite.io/console';
import type { Organization } from '$lib/stores/organization';
- import { daysLeftInTrial } from '$lib/stores/billing';
+ import { daysLeftInTrial, plansInfo } from '$lib/stores/billing';
import { tooltip } from '$lib/actions/tooltip';
import { toLocaleDate } from '$lib/helpers/date';
import { wizard } from '$lib/stores/wizard';
@@ -82,7 +82,7 @@
FREE
{/if}
- {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER}
+ {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER && $plansInfo.get(organization.billingPlan)?.trialDays}
0;
+ $: isTrial =
+ new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 &&
+ $plansInfo.get($organization.billingPlan)?.trialDays;
{#if $organization}
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index f0eb26049..9b600ea44 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -9,7 +9,13 @@
import { toLocaleDate } from '$lib/helpers/date';
import { isTabSelected } from '$lib/helpers/load';
import { Cover } from '$lib/layout';
- import { daysLeftInTrial, getServiceLimit, readOnly, tierToPlan } from '$lib/stores/billing';
+ import {
+ daysLeftInTrial,
+ getServiceLimit,
+ plansInfo,
+ readOnly,
+ tierToPlan
+ } from '$lib/stores/billing';
import {
members,
newMemberModal,
@@ -94,7 +100,7 @@
{#if isCloud && $organization?.billingPlan === BillingPlan.STARTER}
FREE
{/if}
- {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER}
+ {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER && $plansInfo.get($organization.billingPlan)?.trialDays}
{});
+
let coupon: string = null;
let couponData: Partial
= {
code: null,
@@ -48,12 +51,18 @@
$: if ($createOrganization.billingPlan === BillingPlan.STARTER) {
$createOrganizationFinalAction = 'Create organization';
}
+
+ $: if (plan?.trialDays) {
+ $createOrganizationFinalAction = 'Start trial';
+ }
Confirm your details
- Confirm the details of your new organization and start your free trial.
+ Confirm the details of your new organization{!plan.trialDays
+ ? '.'
+ : ' and start your free trial.'}
Organization name
@@ -123,9 +132,9 @@
{#if $createOrganization.billingPlan !== BillingPlan.STARTER}
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())}`}.
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
index f6a3a8fa9..67bed9a75 100644
--- a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
@@ -108,7 +108,9 @@
{tierPro.description}
-
14 DAY FREE TRIAL
+ {#if proPlan?.trialDays}
+
14 DAY FREE TRIAL
+ {/if}
@@ -131,7 +133,6 @@
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 5a94e9ec8..84b9ff788 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 8c1a3e3da..a0545d583 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -1,5 +1,5 @@
{#if downgradeToStarter}
@@ -58,33 +62,17 @@
Your feedback is important to us and helps us improve the services Appwrite offers.
Please let us know if there is a specific reason for changing your plan.
-
-
- Your {tierToPlan($organization.billingPlan).name} plan subscription will end on {toLocaleDate(
- $organization.billingNextInvoiceDate
- )}
-
- Following the payment of your final invoice on {toLocaleDate(
- $organization.billingNextInvoiceDate
- )}, your organization will switch to the {tierToPlan(
- $changeOrganizationTier.billingPlan
- ).name} plan. Until then, you can continue to use the resources available to the {tierToPlan(
- $organization.billingPlan
- ).name} plan.
-
-
-
+
@@ -93,7 +81,11 @@
Confirm your 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
@@ -160,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;