From 92c7f43888366b6935025a7d8ccc8fc38b283522 Mon Sep 17 00:00:00 2001
From: Arman
Date: Thu, 21 Mar 2024 17:57:19 +0100
Subject: [PATCH 1/6] feat: trial changes
---
src/lib/stores/billing.ts | 3 ++-
src/lib/system.ts | 1 +
src/routes/console/account/organizations/+page.svelte | 4 ++--
.../billing/planSummary.svelte | 5 +++--
.../console/organization-[organization]/header.svelte | 4 ++--
.../wizard/cloudOrganization/confirmDetails.svelte | 11 +++++++----
.../cloudOrganization/organizationDetails.svelte | 6 ++++--
.../wizard/cloudOrganization/paymentDetails.svelte | 7 ++++---
src/routes/console/wizard/cloudOrganization/store.ts | 5 ++++-
.../cloudOrganizationChangeTier/choosePlan.svelte | 3 ++-
.../cloudOrganizationChangeTier/confirmDetails.svelte | 11 +++++++----
.../wizard/cloudOrganizationChangeTier/store.ts | 5 ++++-
12 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index c213a7147..3d684f0af 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -10,7 +10,7 @@ import type {
PlansMap,
PaymentMethodData
} from '$lib/sdk/billing';
-import { isCloud } from '$lib/system';
+import { TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
import { cachedStore } from '$lib/helpers/cache';
import { Query } from '@appwrite.io/console';
import { headerAlert } from './headerAlert';
@@ -165,6 +165,7 @@ export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: num
}
export function calculateTrialDay(org: Organization) {
+ if (TRIAL_PERIOD_OVERRIDE) return;
if (org?.billingPlan === BillingPlan.STARTER) return false;
const endDate = new Date(org?.billingStartDate);
const today = new Date();
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 5cb998dca..521833161 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -24,3 +24,4 @@ export const isCloud = MODE === Mode.CLOUD;
export const isSelfHosted = MODE !== Mode.CLOUD;
export const hasStripePublicKey = !!VARS.STRIPE_PUBLIC_KEY;
export const GRACE_PERIOD_OVERRIDE = false;
+export const TRIAL_PERIOD_OVERRIDE = true;
diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte
index 0216b5621..33b397915 100644
--- a/src/routes/console/account/organizations/+page.svelte
+++ b/src/routes/console/account/organizations/+page.svelte
@@ -13,7 +13,7 @@
import CreateOrganization from '../../createOrganization.svelte';
import { sdk } from '$lib/stores/sdk';
import type { PageData } from './$types';
- import { isCloud } from '$lib/system';
+ import { TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
import { Pill } from '$lib/elements';
import type { Models } from '@appwrite.io/console';
import type { Organization } from '$lib/stores/organization';
@@ -82,7 +82,7 @@
FREE
{/if}
- {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER}
+ {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER && !TRIAL_PERIOD_OVERRIDE}
0;
+ $: isTrial = (new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 ) && !TRIAL_PERIOD_OVERRIDE;
{#if $organization}
@@ -53,7 +54,7 @@
{tierToPlan($organization?.billingPlan)?.name} plan
- {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial}
+ {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && }
TRIAL
{/if}
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index f0eb26049..04213a412 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -18,7 +18,7 @@
organizationList
} from '$lib/stores/organization';
import { wizard } from '$lib/stores/wizard';
- import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+ import { GRACE_PERIOD_OVERRIDE, TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
let areMembersLimited: boolean;
@@ -94,7 +94,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 && !TRIAL_PERIOD_OVERRIDE}
Confirm your details
- Confirm the details of your new organization and start your free trial.
+ Confirm the details of your new organization{TRIAL_PERIOD_OVERRIDE
+ ? '.'
+ : ' and start your free trial.'}
Organization name
@@ -123,9 +126,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{TRIAL_PERIOD_OVERRIDE
+ ? '.'
+ : ` 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..ef9231712 100644
--- a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
@@ -8,6 +8,7 @@
import { plansInfo, tierFree, tierPro, tierScale } from '$lib/stores/billing';
import { organizationList, type Organization } from '$lib/stores/organization';
import { updateStepStatus } from '$lib/stores/wizard';
+ import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
import { createOrganization, createOrgSteps } from './store';
let showCustomId = false;
@@ -108,7 +109,9 @@
{tierPro.description}
- 14 DAY FREE TRIAL
+ {#if !TRIAL_PERIOD_OVERRIDE}
+ 14 DAY FREE TRIAL
+ {/if}
@@ -131,7 +134,6 @@
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
index b9378f5f1..ed4c76719 100644
--- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
@@ -12,6 +12,7 @@
import { toLocaleDate } from '$lib/helpers/date';
import { showUsageRatesModal } from '$lib/stores/billing';
import { PaymentBoxes } from '$lib/components/billing';
+ import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
const today = new Date();
const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
@@ -74,9 +75,9 @@
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 !TRIAL_PERIOD_OVERRIDE}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..90749d5e3 100644
--- a/src/routes/console/wizard/cloudOrganization/store.ts
+++ b/src/routes/console/wizard/cloudOrganization/store.ts
@@ -1,10 +1,13 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
import type { Tier } from '$lib/stores/billing';
+import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
import { writable } from 'svelte/store';
export const createOrgSteps = writable(new Map());
-export const createOrganizationFinalAction = writable('Start trial');
+export const createOrganizationFinalAction = writable(
+ TRIAL_PERIOD_OVERRIDE ? 'Create' : 'Start trial'
+);
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..da01e2449 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
@@ -13,6 +13,7 @@
import { Pill } from '$lib/elements';
import { BillingPlan } from '$lib/constants';
import { formatCurrency } from '$lib/helpers/numbers';
+ import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
let usage: OrganizationUsage = null;
let members: Models.MembershipList = null;
@@ -161,7 +162,7 @@
{#if $organization.billingPlan === BillingPlan.PRO}
CURRENT PLAN
- {:else}
+ {:else if !TRIAL_PERIOD_OVERRIDE}
14 DAY FREE TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
index a67c5086e..604907f43 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -16,6 +16,7 @@
feedbackDowngradeOptions,
isUpgrade
} from './store';
+ import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
const plan = $plansInfo.get($changeOrganizationTier.billingPlan);
const collaboratorPrice = plan?.addons.member?.price ?? 0;
@@ -77,7 +78,9 @@
Confirm your details
- Confirm the details of your new organization and start your free trial.
+ Confirm the details of your new organization{TRIAL_PERIOD_OVERRIDE
+ ? '.'
+ : ' and start your free trial.'}
Organization name
@@ -144,9 +147,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{TRIAL_PERIOD_OVERRIDE
+ ? '.'
+ : ` 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..f9cf2af84 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
@@ -1,11 +1,14 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
import type { Tier } from '$lib/stores/billing';
+import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
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(
+ TRIAL_PERIOD_OVERRIDE ? 'Create' : 'Start trial'
+);
export const changeOrganizationTier = writable<{
billingPlan: Tier;
From c2eb228eb75830507a48486fe505c44c184c6e96 Mon Sep 17 00:00:00 2001
From: Arman
Date: Wed, 3 Apr 2024 14:06:20 +0200
Subject: [PATCH 2/6] fix: error
---
.../organization-[organization]/billing/planSummary.svelte | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/routes/console/organization-[organization]/billing/planSummary.svelte b/src/routes/console/organization-[organization]/billing/planSummary.svelte
index ce08531b9..044eec83d 100644
--- a/src/routes/console/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/console/organization-[organization]/billing/planSummary.svelte
@@ -30,7 +30,9 @@
$: currentPlan = $plansInfo?.get($organization?.billingPlan);
$: extraUsage = currentInvoice?.amount - currentPlan?.price;
- $: isTrial = (new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 ) && !TRIAL_PERIOD_OVERRIDE;
+ $: isTrial =
+ new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 &&
+ !TRIAL_PERIOD_OVERRIDE;
{#if $organization}
@@ -54,7 +56,7 @@
{tierToPlan($organization?.billingPlan)?.name} plan
- {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && }
+ {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && !TRIAL_PERIOD_OVERRIDE}
TRIAL
{/if}
From 240eda2619d1212f36862c7eccc4444b8c7d8d0e Mon Sep 17 00:00:00 2001
From: Arman
Date: Wed, 10 Apr 2024 15:35:20 +0200
Subject: [PATCH 3/6] chore: rename variable for more clarity
---
src/lib/stores/billing.ts | 4 ++--
src/lib/system.ts | 2 +-
src/routes/console/account/organizations/+page.svelte | 4 ++--
.../billing/planSummary.svelte | 6 +++---
.../console/organization-[organization]/header.svelte | 5 ++---
.../wizard/cloudOrganization/confirmDetails.svelte | 6 +++---
.../cloudOrganization/organizationDetails.svelte | 4 ++--
.../wizard/cloudOrganization/paymentDetails.svelte | 8 ++------
src/routes/console/wizard/cloudOrganization/store.ts | 4 ++--
.../cloudOrganizationChangeTier/choosePlan.svelte | 4 ++--
.../cloudOrganizationChangeTier/confirmDetails.svelte | 10 +++++-----
.../wizard/cloudOrganizationChangeTier/store.ts | 4 ++--
12 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 1a00cc840..1462f5125 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -10,7 +10,7 @@ import type {
PlansMap,
PaymentMethodData
} from '$lib/sdk/billing';
-import { TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+import { IS_TRIAL_DISABLED, isCloud } from '$lib/system';
import { cachedStore } from '$lib/helpers/cache';
import { Query } from '@appwrite.io/console';
import { headerAlert } from './headerAlert';
@@ -169,7 +169,7 @@ export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: num
}
export function calculateTrialDay(org: Organization) {
- if (TRIAL_PERIOD_OVERRIDE) return;
+ if (IS_TRIAL_DISABLED) return;
if (org?.billingPlan === BillingPlan.STARTER) return false;
const endDate = new Date(org?.billingStartDate);
const today = new Date();
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 521833161..adc04027e 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -24,4 +24,4 @@ export const isCloud = MODE === Mode.CLOUD;
export const isSelfHosted = MODE !== Mode.CLOUD;
export const hasStripePublicKey = !!VARS.STRIPE_PUBLIC_KEY;
export const GRACE_PERIOD_OVERRIDE = false;
-export const TRIAL_PERIOD_OVERRIDE = true;
+export const IS_TRIAL_DISABLED = true;
diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte
index 33b397915..be2b778a2 100644
--- a/src/routes/console/account/organizations/+page.svelte
+++ b/src/routes/console/account/organizations/+page.svelte
@@ -13,7 +13,7 @@
import CreateOrganization from '../../createOrganization.svelte';
import { sdk } from '$lib/stores/sdk';
import type { PageData } from './$types';
- import { TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
+ import { IS_TRIAL_DISABLED, isCloud } from '$lib/system';
import { Pill } from '$lib/elements';
import type { Models } from '@appwrite.io/console';
import type { Organization } from '$lib/stores/organization';
@@ -82,7 +82,7 @@
FREE
{/if}
- {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER && !TRIAL_PERIOD_OVERRIDE}
+ {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER && !IS_TRIAL_DISABLED}
0 &&
- !TRIAL_PERIOD_OVERRIDE;
+ !IS_TRIAL_DISABLED;
{#if $organization}
@@ -56,7 +56,7 @@
{tierToPlan($organization?.billingPlan)?.name} plan
- {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && !TRIAL_PERIOD_OVERRIDE}
+ {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && !IS_TRIAL_DISABLED}
TRIAL
{/if}
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index 04213a412..7d8facfd9 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -19,8 +19,7 @@
} from '$lib/stores/organization';
import { wizard } from '$lib/stores/wizard';
import { GRACE_PERIOD_OVERRIDE, TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
- import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
-
+ import CreateOrganizationCloud from '../createOrganizationCloud.sveltIS_TRIAL_ENABLED
let areMembersLimited: boolean;
$: organization.subscribe(() => {
const limit = getServiceLimit('members') || Infinity;
@@ -102,7 +101,7 @@
$organization.billingStartDate
)}. ${$daysLeftInTrial} days remaining.`
}}>
- TRIAL
+ TRIALIS_TRIAL_ENABLED
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index 3be83c868..fac476d10 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -9,7 +9,7 @@
import type { Coupon } from '$lib/sdk/billing';
import { plansInfo } from '$lib/stores/billing';
import { sdk } from '$lib/stores/sdk';
- import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
+ import { IS_TRIAL_DISABLED } from '$lib/system';
import { createOrganization, createOrganizationFinalAction } from './store';
const plan = $plansInfo?.get($createOrganization.billingPlan);
@@ -54,7 +54,7 @@
Confirm your details
- Confirm the details of your new organization{TRIAL_PERIOD_OVERRIDE
+ Confirm the details of your new organization{IS_TRIAL_DISABLED
? '.'
: ' and start your free trial.'}
@@ -126,7 +126,7 @@
{#if $createOrganization.billingPlan !== BillingPlan.STARTER}
This amount, and any additional usage fees, will be charged on a recurring 30-day
- billing cycle{TRIAL_PERIOD_OVERRIDE
+ billing cycle{IS_TRIAL_DISABLED
? '.'
: ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}.
diff --git a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
index ef9231712..dfe8c80d6 100644
--- a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
@@ -8,7 +8,7 @@
import { plansInfo, tierFree, tierPro, tierScale } from '$lib/stores/billing';
import { organizationList, type Organization } from '$lib/stores/organization';
import { updateStepStatus } from '$lib/stores/wizard';
- import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
+ import { IS_TRIAL_DISABLED } from '$lib/system';
import { createOrganization, createOrgSteps } from './store';
let showCustomId = false;
@@ -109,7 +109,7 @@
{tierPro.description}
- {#if !TRIAL_PERIOD_OVERRIDE}
+ {#if !IS_TRIAL_DISABLED}
14 DAY FREE TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
index ed4c76719..023f42ad0 100644
--- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
@@ -13,8 +13,7 @@
import { showUsageRatesModal } from '$lib/stores/billing';
import { PaymentBoxes } from '$lib/components/billing';
import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
-
- const today = new Date();
+IS_TRIAL_ENABLEDnew Date();
const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
let methods: PaymentList;
@@ -83,10 +82,7 @@
-
- (new Map());
export const createOrganizationFinalAction = writable(
- TRIAL_PERIOD_OVERRIDE ? 'Create' : 'Start trial'
+ IS_TRIAL_DISABLED ? 'Create' : 'Start trial'
);
export const createOrganization = writable<{
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
index da01e2449..d3fe6418b 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
@@ -15,8 +15,7 @@
import { formatCurrency } from '$lib/helpers/numbers';
import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
- let usage: OrganizationUsage = null;
- let members: Models.MembershipList = null;
+ IS_TRIAL_ENABLED let members: Models.MembershipList = null;
$: if ($changeOrganizationTier.billingPlan === BillingPlan.STARTER && $changeTierSteps) {
$changeTierSteps = updateStepStatus($changeTierSteps, 2, true);
@@ -142,6 +141,7 @@
+ IS_TRIAL_ENABLED
{:else}
-
+ IS_TRIAL_ENABLED
Confirm your details
Confirm the details of your new organization{TRIAL_PERIOD_OVERRIDE
@@ -126,8 +126,8 @@
{/if}
-
- {#if $changeOrganizationTier.billingPlan !== BillingPlan.STARTER}
+ IS_TRIAL_ENABLED{#if $changeOrganizationTier.billingPlan !== BillingPlan.STARTER}
(new Map());
export const isUpgrade = writable(false);
export const changeOrganizationFinalAction = writable(
- TRIAL_PERIOD_OVERRIDE ? 'Create' : 'Start trial'
+ IS_TRIAL_DISABLED ? 'Create' : 'Start trial'
);
export const changeOrganizationTier = writable<{
From 644a9d3f076874bd2b1f57d50dcfb7a4e142306c Mon Sep 17 00:00:00 2001
From: Arman
Date: Wed, 10 Apr 2024 15:39:01 +0200
Subject: [PATCH 4/6] fix: issues and remove extra commas
---
.../organization-[organization]/header.svelte | 9 ++--
.../cloudOrganization/confirmDetails.svelte | 2 +-
.../cloudOrganization/paymentDetails.svelte | 14 +++---
.../choosePlan.svelte | 8 ++--
.../confirmDetails.svelte | 44 ++++++-------------
5 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index 7d8facfd9..c77fecedf 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -18,8 +18,9 @@
organizationList
} from '$lib/stores/organization';
import { wizard } from '$lib/stores/wizard';
- import { GRACE_PERIOD_OVERRIDE, TRIAL_PERIOD_OVERRIDE, isCloud } from '$lib/system';
- import CreateOrganizationCloud from '../createOrganizationCloud.sveltIS_TRIAL_ENABLED
+ import { GRACE_PERIOD_OVERRIDE, IS_TRIAL_DISABLED, isCloud } from '$lib/system';
+ import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
+
let areMembersLimited: boolean;
$: organization.subscribe(() => {
const limit = getServiceLimit('members') || Infinity;
@@ -93,7 +94,7 @@
{#if isCloud && $organization?.billingPlan === BillingPlan.STARTER}
FREE
{/if}
- {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER && !TRIAL_PERIOD_OVERRIDE}
+ {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER && !IS_TRIAL_DISABLED}
-
TRIALIS_TRIAL_ENABLED
+
TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index fac476d10..00806f4ea 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -127,7 +127,7 @@
This amount, and any additional usage fees, will be charged on a recurring 30-day
billing cycle{IS_TRIAL_DISABLED
- ? '.'
+ ? ''
: ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}.
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
index 023f42ad0..5b03cee1e 100644
--- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
@@ -12,8 +12,9 @@
import { toLocaleDate } from '$lib/helpers/date';
import { showUsageRatesModal } from '$lib/stores/billing';
import { PaymentBoxes } from '$lib/components/billing';
- import { TRIAL_PERIOD_OVERRIDE } from '$lib/system';
-IS_TRIAL_ENABLEDnew Date();
+ import { IS_TRIAL_DISABLED } from '$lib/system';
+
+ const today = new Date();
const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
let methods: PaymentList;
@@ -74,15 +75,18 @@ IS_TRIAL_ENABLEDnew Date();
Payment details
- Add a payment method to your organization. {#if !TRIAL_PERIOD_OVERRIDE}You will not be
- charged until your trial ends on {toLocaleDate(billingPayDate.toString())}.
+ Add a payment method to your organization. {#if !IS_TRIAL_DISABLED}You will not be charged
+ until your trial ends on {toLocaleDate(billingPayDate.toString())}.
{/if}
+
+
- IS_TRIAL_ENABLED
{#if $organization.billingPlan === BillingPlan.PRO}
CURRENT PLAN
- {:else if !TRIAL_PERIOD_OVERRIDE}
+ {:else if !IS_TRIAL_DISABLED}
14 DAY FREE TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
index 7f29df8ee..dc5e16fb1 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -1,5 +1,5 @@
{#if $organization}
@@ -56,7 +55,7 @@
{tierToPlan($organization?.billingPlan)?.name} plan
- {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial && !IS_TRIAL_DISABLED}
+ {#if $organization?.billingPlan !== BillingPlan.STARTER && isTrial}
TRIAL
{/if}
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index c77fecedf..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,
@@ -18,7 +24,7 @@
organizationList
} from '$lib/stores/organization';
import { wizard } from '$lib/stores/wizard';
- import { GRACE_PERIOD_OVERRIDE, IS_TRIAL_DISABLED, isCloud } from '$lib/system';
+ import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
let areMembersLimited: boolean;
@@ -94,7 +100,7 @@
{#if isCloud && $organization?.billingPlan === BillingPlan.STARTER}
FREE
{/if}
- {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER && !IS_TRIAL_DISABLED}
+ {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER && $plansInfo.get($organization.billingPlan)?.trialDays}
Confirm your details
- Confirm the details of your new organization{IS_TRIAL_DISABLED
+ Confirm the details of your new organization{!plan.trialDays
? '.'
: ' and start your free trial.'}
@@ -126,7 +125,7 @@
{#if $createOrganization.billingPlan !== BillingPlan.STARTER}
This amount, and any additional usage fees, will be charged on a recurring 30-day
- billing cycle{IS_TRIAL_DISABLED
+ billing cycle{!plan.trialDays
? ''
: ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}.
diff --git a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
index dfe8c80d6..67bed9a75 100644
--- a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
@@ -8,7 +8,6 @@
import { plansInfo, tierFree, tierPro, tierScale } from '$lib/stores/billing';
import { organizationList, type Organization } from '$lib/stores/organization';
import { updateStepStatus } from '$lib/stores/wizard';
- import { IS_TRIAL_DISABLED } from '$lib/system';
import { createOrganization, createOrgSteps } from './store';
let showCustomId = false;
@@ -109,7 +108,7 @@
{tierPro.description}
- {#if !IS_TRIAL_DISABLED}
+ {#if proPlan?.trialDays}
14 DAY FREE TRIAL
{/if}
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
index 5b03cee1e..956064b66 100644
--- a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
@@ -10,9 +10,8 @@
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';
- import { IS_TRIAL_DISABLED } from '$lib/system';
const today = new Date();
const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
@@ -75,8 +74,10 @@
Payment details
- Add a payment method to your organization. {#if !IS_TRIAL_DISABLED}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 73b050b60..f25d7d5f8 100644
--- a/src/routes/console/wizard/cloudOrganization/store.ts
+++ b/src/routes/console/wizard/cloudOrganization/store.ts
@@ -1,12 +1,12 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import type { Tier } from '$lib/stores/billing';
-import { IS_TRIAL_DISABLED } from '$lib/system';
-import { writable } from 'svelte/store';
+import { plansInfo, type Tier } from '$lib/stores/billing';
+import { organization } from '$lib/stores/organization';
+import { get, writable } from 'svelte/store';
export const createOrgSteps = writable(new Map());
export const createOrganizationFinalAction = writable(
- IS_TRIAL_DISABLED ? 'Create' : 'Start trial'
+ get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
);
export const createOrganization = writable<{
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
index ad1d62aa1..84b9ff788 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
@@ -13,7 +13,6 @@
import { Pill } from '$lib/elements';
import { BillingPlan } from '$lib/constants';
import { formatCurrency } from '$lib/helpers/numbers';
- import { IS_TRIAL_DISABLED } from '$lib/system';
let usage: OrganizationUsage = null;
let members: Models.MembershipList = null;
@@ -162,8 +161,8 @@
{#if $organization.billingPlan === BillingPlan.PRO}
CURRENT PLAN
- {:else if !IS_TRIAL_DISABLED}
-
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 dc5e16fb1..9b87670bf 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
@@ -16,7 +16,6 @@
feedbackDowngradeOptions,
isUpgrade
} from './store';
- import { IS_TRIAL_DISABLED } from '$lib/system';
const plan = $plansInfo.get($changeOrganizationTier.billingPlan);
const collaboratorPrice = plan?.addons.member?.price ?? 0;
@@ -78,7 +77,9 @@
Confirm your details
- Confirm the details of your new organization{IS_TRIAL_DISABLED
+ Confirm the details of your new organization{!$plansInfo.get(
+ $changeOrganizationTier.billingPlan
+ )?.trialDays
? '.'
: ' and start your free trial.'}
@@ -147,7 +148,7 @@
This amount, and any additional usage fees, will be charged on a recurring 30-day
- billing cycle{IS_TRIAL_DISABLED
+ 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 2c3ae0501..8d5fad783 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
@@ -1,13 +1,13 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import type { Tier } from '$lib/stores/billing';
-import { IS_TRIAL_DISABLED } from '$lib/system';
-import { writable } from 'svelte/store';
+import { plansInfo, type Tier } from '$lib/stores/billing';
+import { organization } from '$lib/stores/organization';
+import { get, writable } from 'svelte/store';
export const changeTierSteps = writable(new Map());
export const isUpgrade = writable(false);
export const changeOrganizationFinalAction = writable(
- IS_TRIAL_DISABLED ? 'Create' : 'Start trial'
+ get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
);
export const changeOrganizationTier = writable<{
From 16c1f6b39764f7318a4bdc8fb085636370f90d61 Mon Sep 17 00:00:00 2001
From: Arman
Date: Wed, 17 Apr 2024 14:46:43 +0200
Subject: [PATCH 6/6] fix: plan final action text
---
src/routes/console/+layout.svelte | 7 +++++--
.../wizard/cloudOrganization/confirmDetails.svelte | 7 +++++++
src/routes/console/wizard/cloudOrganization/store.ts | 9 +++------
.../cloudOrganizationChangeTier/confirmDetails.svelte | 4 ++++
.../console/wizard/cloudOrganizationChangeTier/store.ts | 9 +++------
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index dd45948cc..81fdcc85e 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);
+ }
}
}
});
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index 214a2cc24..36b0ec6df 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -9,6 +9,7 @@
import type { Coupon } from '$lib/sdk/billing';
import { plansInfo } from '$lib/stores/billing';
import { sdk } from '$lib/stores/sdk';
+ import { onMount } from 'svelte';
import { createOrganization, createOrganizationFinalAction } from './store';
const plan = $plansInfo?.get($createOrganization.billingPlan);
@@ -18,6 +19,8 @@
const today = new Date();
const billingPayDate = new Date(today.getTime() + 44 * 24 * 60 * 60 * 1000);
+ onMount(() => {});
+
let coupon: string = null;
let couponData: Partial = {
code: null,
@@ -48,6 +51,10 @@
$: if ($createOrganization.billingPlan === BillingPlan.STARTER) {
$createOrganizationFinalAction = 'Create organization';
}
+
+ $: if (plan?.trialDays) {
+ $createOrganizationFinalAction = 'Start trial';
+ }
diff --git a/src/routes/console/wizard/cloudOrganization/store.ts b/src/routes/console/wizard/cloudOrganization/store.ts
index f25d7d5f8..55a53175c 100644
--- a/src/routes/console/wizard/cloudOrganization/store.ts
+++ b/src/routes/console/wizard/cloudOrganization/store.ts
@@ -1,13 +1,10 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import { plansInfo, type Tier } from '$lib/stores/billing';
-import { organization } from '$lib/stores/organization';
-import { get, writable } from 'svelte/store';
+import { type Tier } from '$lib/stores/billing';
+import { writable } from 'svelte/store';
export const createOrgSteps = writable(new Map());
-export const createOrganizationFinalAction = writable(
- get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
-);
+export const createOrganizationFinalAction = writable('Create');
export const createOrganization = writable<{
id?: string;
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
index 9b87670bf..a0545d583 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}
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
index 8d5fad783..57463d106 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
@@ -1,14 +1,11 @@
import { BillingPlan } from '$lib/constants';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import { plansInfo, type Tier } from '$lib/stores/billing';
-import { organization } from '$lib/stores/organization';
-import { get, writable } from 'svelte/store';
+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(
- get(plansInfo)?.get(get(organization)?.billingPlan)?.trialDays ? 'Start trial' : 'Create'
-);
+export const changeOrganizationFinalAction = writable('Create');
export const changeOrganizationTier = writable<{
billingPlan: Tier;