Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-30 22:41:33 +01:00
Code Issues Projects Releases Wiki Activity

Changes for old plan to updated to new plan (#13013)

Browse Source
This commit is contained in:
cyprain-okeke 2025-01-22 19:26:58 +01:00 committed by GitHub
parent 1e14d6d648
commit c1ebe95cdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
View File

@ -49,6 +49,7 @@ import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/mode
import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ListResponse } from "@bitwarden/common/models/response/list.response";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@ -183,7 +184,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
focusedIndex: number | null = null;
accountCredit: number;
paymentSource?: PaymentSourceResponse;
plans: ListResponse<PlanResponse>;
deprecateStripeSourcesAPI: boolean;
isSubscriptionCanceled: boolean = false;
@ -237,9 +238,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
}
if (!this.selfHosted) {
const plans = await this.apiService.getPlans();
this.passwordManagerPlans = plans.data.filter((plan) => !!plan.PasswordManager);
this.secretsManagerPlans = plans.data.filter((plan) => !!plan.SecretsManager);
this.plans = await this.apiService.getPlans();
this.passwordManagerPlans = this.plans.data.filter((plan) => !!plan.PasswordManager);
this.secretsManagerPlans = this.plans.data.filter((plan) => !!plan.SecretsManager);
if (
this.productTier === ProductTierType.Enterprise ||
@ -791,8 +792,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
billingEmail: org.billingEmail,
};
const filteredPlan = this.plans.data
.filter((plan) => plan.productTier === this.selectedPlan.productTier && !plan.legacyYear)
.find((plan) => {
const isSameBillingCycle = plan.isAnnual === this.selectedPlan.isAnnual;
return isSameBillingCycle;
});
const plan: PlanInformation = {
type: this.selectedPlan.type,
type: filteredPlan.type,
passwordManagerSeats: org.seats,
};