From 92c7f43888366b6935025a7d8ccc8fc38b283522 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 21 Mar 2024 17:57:19 +0100 Subject: [PATCH] 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 @@

- COMING SOON
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;