1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-09 03:53:53 +00:00

[PM 26691] [Fix: Remove dollar amount from total section when redeeming free families for enterprise (#16887)

* Resolve the dollar amount issue

* Resolve the non addition of storage amount

* Resolve the estimate tax amount

* Fix the improper tax calculation

* resolv ethe duplicate code

* Added changes to apply the discount only for acceptingSponsorship = true
This commit is contained in:
cyprain-okeke
2025-10-30 11:35:34 +01:00
committed by GitHub
parent 55a6e25c0d
commit e41680df41
3 changed files with 97 additions and 60 deletions

View File

@@ -670,6 +670,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
if (this.selectedPlan.PasswordManager.hasPremiumAccessOption) {
subTotal += this.selectedPlan.PasswordManager.premiumAccessOptionPrice;
}
if (this.selectedPlan.PasswordManager.hasAdditionalStorageOption) {
subTotal += this.additionalStorageTotal(this.selectedPlan);
}
return subTotal - this.discount;
}
@@ -707,18 +710,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
}
if (this.organization.useSecretsManager) {
return (
this.passwordManagerSubtotal +
this.additionalStorageTotal(this.selectedPlan) +
this.secretsManagerSubtotal() +
this.estimatedTax
);
return this.passwordManagerSubtotal + this.secretsManagerSubtotal() + this.estimatedTax;
}
return (
this.passwordManagerSubtotal +
this.additionalStorageTotal(this.selectedPlan) +
this.estimatedTax
);
return this.passwordManagerSubtotal + this.estimatedTax;
}
get teamsStarterPlanIsAvailable() {