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 @@