bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

make the pricing breakdown to show properly (#12982)

Browse Source
This commit is contained in:
cyprain-okeke
2025-01-21 16:01:48 +01:00
committed by GitHub
parent b92a98110e
commit 4066022e18
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/web/src/app/billing/organizations/change-plan-dialog.component.html
View File

@@ -130,7 +130,7 @@
: selectableProduct.PasswordManager.seatPrice : selectableProduct.PasswordManager.seatPrice
) | currency: "$" ) | currency: "$"
}} }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</ng-container> </ng-container>
</b> </b>
</ng-container> </ng-container>
@@ -400,7 +400,7 @@
: selectedPlan.PasswordManager.basePrice : selectedPlan.PasswordManager.basePrice
) | currency: "$" ) | currency: "$"
}} }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
<ng-container *ngIf="acceptingSponsorship; else notAcceptingSponsorship"> <ng-container *ngIf="acceptingSponsorship; else notAcceptingSponsorship">
@@ -427,7 +427,7 @@
<span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.PasswordManager.seatPrice | currency: "$" }} {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
@@ -444,7 +444,7 @@
{{ "additionalStorageGbMessage" | i18n }} {{ "additionalStorageGbMessage" | i18n }}
&times; &times;
{{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }} {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ additionalStorageTotal(selectedPlan) | currency: "$" }}</span> <span>{{ additionalStorageTotal(selectedPlan) | currency: "$" }}</span>
</p> </p>
@@ -485,7 +485,7 @@
: selectedPlan.SecretsManager.basePrice : selectedPlan.SecretsManager.basePrice
) | currency: "$" ) | currency: "$"
}} }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
</p> </p>
<p <p
@@ -504,7 +504,7 @@
<span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.SecretsManager.seatPrice | currency: "$" }} {{ selectedPlan.SecretsManager.seatPrice | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
@@ -524,7 +524,7 @@
{{ "serviceAccounts" | i18n | lowercase }} {{ "serviceAccounts" | i18n | lowercase }}
&times; &times;
{{ selectedPlan?.SecretsManager?.additionalPricePerServiceAccount | currency: "$" }} {{ selectedPlan?.SecretsManager?.additionalPricePerServiceAccount | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span> <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
</p> </p>
@@ -580,7 +580,7 @@
<span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.PasswordManager.seatPrice | currency: "$" }} {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
{{ passwordManagerSeatTotal(selectedPlan) | currency: "$" }} {{ passwordManagerSeatTotal(selectedPlan) | currency: "$" }}
@@ -596,7 +596,7 @@
{{ "additionalStorageGbMessage" | i18n }} {{ "additionalStorageGbMessage" | i18n }}
&times; &times;
{{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }} {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ <span>{{
storageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb | currency: "$" storageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb | currency: "$"
@@ -656,7 +656,7 @@
<span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.SecretsManager.seatPrice | currency: "$" }} {{ selectedPlan.SecretsManager.seatPrice | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
{{ secretsManagerSeatTotal(selectedPlan, sub?.smSeats) | currency: "$" }} {{ secretsManagerSeatTotal(selectedPlan, sub?.smSeats) | currency: "$" }}
@@ -675,7 +675,7 @@
{{ "serviceAccounts" | i18n | lowercase }} {{ "serviceAccounts" | i18n | lowercase }}
&times; &times;
{{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }} {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span> <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
</p> </p>
@@ -725,7 +725,7 @@
: selectedPlan.SecretsManager.basePrice : selectedPlan.SecretsManager.basePrice
) | currency: "$" ) | currency: "$"
}} }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
</p> </p>
<p <p
@@ -744,7 +744,7 @@
<span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.SecretsManager.seatPrice | currency: "$" }} {{ selectedPlan.SecretsManager.seatPrice | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
@@ -764,7 +764,7 @@
{{ "serviceAccounts" | i18n }} {{ "serviceAccounts" | i18n }}
&times; &times;
{{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }} {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span> <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
</p> </p>
@@ -786,7 +786,7 @@
: selectedPlan.PasswordManager.basePrice : selectedPlan.PasswordManager.basePrice
) | currency: "$" ) | currency: "$"
}} }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
<ng-container *ngIf="acceptingSponsorship; else notAcceptingSponsorship"> <ng-container *ngIf="acceptingSponsorship; else notAcceptingSponsorship">
@@ -813,7 +813,7 @@
<span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.PasswordManager.seatPrice | currency: "$" }} {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
/{{ "year" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span *ngIf="isSecretsManagerTrial()"> <span *ngIf="isSecretsManagerTrial()">
@@ -860,7 +860,7 @@
<span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.SecretsManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.SecretsManager.seatPrice | currency: "$" }} {{ selectedPlan.SecretsManager.seatPrice | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span> <span>
{{ secretsManagerSeatTotal(selectedPlan, sub?.smSeats) | currency: "$" }} {{ secretsManagerSeatTotal(selectedPlan, sub?.smSeats) | currency: "$" }}
@@ -879,7 +879,7 @@
{{ "serviceAccounts" | i18n }} {{ "serviceAccounts" | i18n }}
&times; &times;
{{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }} {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span> <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
</p> </p>
@@ -914,7 +914,7 @@
<span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span> <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
&times; &times;
{{ selectedPlan.PasswordManager.seatPrice | currency: "$" }} {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
/{{ "month" | i18n }} /{{ selectedPlanInterval | i18n }}
</span> </span>
<span *ngIf="isSecretsManagerTrial()"> <span *ngIf="isSecretsManagerTrial()">
{{ "freeForOneYear" | i18n }} {{ "freeForOneYear" | i18n }}

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

@@ -485,6 +485,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
} }
get selectedPlanInterval() { get selectedPlanInterval() {
if (this.isSubscriptionCanceled) {
return this.currentPlan.isAnnual ? "year" : "month";
}
return this.selectedPlan.isAnnual ? "year" : "month"; return this.selectedPlan.isAnnual ? "year" : "month";
} }