bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 07:13:32 +00:00
Code Issues Releases Wiki Activity

Removed 2023 plans for view for grandfathered 2020 providers (#8804)

Browse Source
This commit is contained in:
Conner Turnbull
2024-04-19 13:15:30 -04:00
committed by GitHub
parent 1e67014158
commit ddee74fdee
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web/src/app/billing/organizations/organization-plans.component.ts
View File

@@ -48,11 +48,7 @@ interface OnSuccessArgs {
organizationId: string; organizationId: string;
} }
const AllowedLegacyPlanTypes = [ const Allowed2020PlansForLegacyProviders = [
PlanType.TeamsMonthly2023,
PlanType.TeamsAnnually2023,
PlanType.EnterpriseAnnually2023,
PlanType.EnterpriseMonthly2023,
PlanType.TeamsMonthly2020, PlanType.TeamsMonthly2020,
PlanType.TeamsAnnually2020, PlanType.TeamsAnnually2020,
PlanType.EnterpriseAnnually2020, PlanType.EnterpriseAnnually2020,
@@ -283,7 +279,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
(!this.currentPlan || this.currentPlan.upgradeSortOrder < plan.upgradeSortOrder) && (!this.currentPlan || this.currentPlan.upgradeSortOrder < plan.upgradeSortOrder) &&
(!this.hasProvider || plan.product !== ProductType.TeamsStarter) && (!this.hasProvider || plan.product !== ProductType.TeamsStarter) &&
((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) || ((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) ||
(this.isProviderQualifiedFor2020Plan() && AllowedLegacyPlanTypes.includes(plan.type))), (this.isProviderQualifiedFor2020Plan() &&
Allowed2020PlansForLegacyProviders.includes(plan.type))),
); );
result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder); result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder);
@@ -298,7 +295,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
(plan) => (plan) =>
plan.product === selectedProductType && plan.product === selectedProductType &&
((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) || ((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) ||
(this.isProviderQualifiedFor2020Plan() && AllowedLegacyPlanTypes.includes(plan.type))), (this.isProviderQualifiedFor2020Plan() &&
Allowed2020PlansForLegacyProviders.includes(plan.type))),
) || []; ) || [];
result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder); result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder);