diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html index b30bc88e..bd13503b 100644 --- a/src/app/settings/organization-plans.component.html +++ b/src/app/settings/organization-plans.component.html @@ -219,6 +219,14 @@

{{ (createOrganization ? 'paymentInformation' : 'billingInformation') | i18n}}

+ + {{'paymentChargedWithTrial' | i18n}} + + + + {{'paymentCharged' | i18n : (selectedPlanInterval | i18n) }} + +
@@ -233,14 +241,6 @@

{{'total' | i18n}}: {{total | currency:'USD $'}}/{{selectedPlanInterval | i18n}}

- - {{'paymentChargedWithTrial' | i18n : (selectedPlanInterval | i18n) }} - - - - {{'paymentCharged' | i18n : (selectedPlanInterval | i18n) }} - - diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts index f2e9b2dd..dc00ee38 100644 --- a/src/app/settings/organization-plans.component.ts +++ b/src/app/settings/organization-plans.component.ts @@ -68,7 +68,6 @@ export class OrganizationPlansComponent implements OnInit { productTypes = ProductType; formPromise: Promise; singleOrgPolicyBlock: boolean = false; - freeTrial: boolean = false; plans: PlanResponse[]; @@ -177,6 +176,10 @@ export class OrganizationPlansComponent implements OnInit { return subTotal; } + get freeTrial() { + return this.selectedPlan.trialPeriodDays != null; + } + get taxCharges() { return this.taxComponent != null && this.taxComponent.taxRate != null ? (this.taxComponent.taxRate / 100) * this.subtotal : @@ -201,7 +204,6 @@ export class OrganizationPlansComponent implements OnInit { this.selectedPlan.hasAdditionalSeatsOption) { this.additionalSeats = 1; } - this.freeTrial = this.selectedPlan.trialPeriodDays != null; } changedOwnedBusiness() { diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 781b81d3..91a2a44a 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1736,13 +1736,7 @@ } }, "paymentChargedWithTrial": { - "message": "Your plan comes with a free 7 day trial. Your payment method will not be charged until the trial has ended. Billing will occur on a recurring basis each $INTERVAL$. You may cancel at any time.", - "placeholders": { - "interval": { - "content": "$1", - "example": "month or year" - } - } + "message": "Your plan comes with a free 7 day trial. Your payment method will not be charged until the trial has ended. You may cancel at any time." }, "paymentInformation": { "message": "Payment Information"