devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

fixes to plan/pricing page (#776)

This commit is contained in:
Kyle Spearrin 2021-01-15 14:46:25 -05:00 committed by GitHub
parent 03aa806af6
commit 5a8198a878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/settings/create-organization.component.ts
View File

@ -5,6 +5,9 @@ import {
} from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { PlanType } from 'jslib/enums/planType';
import { ProductType } from 'jslib/enums/productType';
import { OrganizationPlansComponent } from './organization-plans.component';
@Component({
@ -18,8 +21,15 @@ export class CreateOrganizationComponent implements OnInit {
ngOnInit() {
const queryParamsSub = this.route.queryParams.subscribe(async (qParams) => {
if (qParams.plan === 'families' || qParams.plan === 'teams' || qParams.plan === 'enterprise') {
this.orgPlansComponent.plan = qParams.plan;
if (qParams.plan === 'families') {
this.orgPlansComponent.plan = PlanType.FamiliesAnnually;
this.orgPlansComponent.product = ProductType.Families;
} else if (qParams.plan === 'teams') {
this.orgPlansComponent.plan = PlanType.TeamsAnnually;
this.orgPlansComponent.product = ProductType.Teams;
} else if (qParams.plan === 'enterprise') {
this.orgPlansComponent.plan = PlanType.EnterpriseAnnually;
this.orgPlansComponent.product = ProductType.Enterprise;
}
if (queryParamsSub != null) {
queryParamsSub.unsubscribe();

3
src/app/settings/organization-plans.component.html
View File

@ -54,6 +54,9 @@
<small *ngIf="selectableProduct.hasSelfHost">• {{'onPremHostingOptional' | i18n}}</small>
<small *ngIf="selectableProduct.hasSso">• {{'includeSsoAuthentication' | i18n}}</small>
<small *ngIf="selectableProduct.hasPolicies">• {{'includeEnterprisePolicies' | i18n}}</small>
<small *ngIf="selectableProduct.trialPeriodDays">•
{{'xDayFreeTrial' | i18n : selectableProduct.trialPeriodDays }}
</small>
</ng-container>
<ng-template #fullFeatureList>
<small *ngIf="selectableProduct.product == productTypes.Free">•

6
src/app/settings/organization-plans.component.ts
View File

@ -74,6 +74,9 @@ export class OrganizationPlansComponent implements OnInit {
if (!this.selfHosted) {
const plans = await this.apiService.getPlans();
this.plans = plans.data;
if (this.product === ProductType.Enterprise || this.product === ProductType.Teams) {
this.ownedBusiness = true;
}
}
this.loading = false;
}
@ -189,7 +192,8 @@ export class OrganizationPlansComponent implements OnInit {
if (!this.ownedBusiness || this.selectedPlan.canBeUsedByBusiness) {
return;
}
this.plan = PlanType.TeamsMonthly;
this.product = ProductType.Teams;
this.plan = PlanType.TeamsAnnually;
}
changedCountry() {