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

[AC-3022]Selecting a plan makes the plan cards content to auto-adjusts (#10992)

Browse Source 
* Resolve the recommended issue

* Resolve the discount display issues

* remove unused tw property

* Resolve all the outstanding bugs

* Fix the A11y bug

* Resolve the base storage issue

* Rename service account in the summary

* changes for the A11y bug

* Fix the improper keyboard navigation in modal

* Add some additional ui changes
This commit is contained in:
cyprain-okeke
2024-09-12 19:12:38 +01:00
committed by GitHub
parent f70b3df2d2
commit fc2c83f0d3
5 changed files with 303 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
View File

@@ -69,14 +69,25 @@
></app-subscription-status>
<ng-container *ngIf="userOrg.canEditSubscription">
<div class="tw-flex-col">
<strong class="tw-block tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300">{{
"details" | i18n
}}</strong>
<strong class="tw-block tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300"
>{{ "details" | i18n
}}<span
class="tw-ml-3"
*ngIf="customerDiscount?.percentOff > 0 && !isSecretsManagerTrial()"
bitBadge
variant="success"
>{{ "providerDiscount" | i18n: customerDiscount?.percentOff }}</span
></strong
>
<bit-table>
<ng-template body>
<ng-container *ngIf="subscription">
<tr bitRow *ngFor="let i of subscriptionLineItems">
<td bitCell [ngClass]="{ 'tw-pl-20': i.addonSubscriptionItem }">
<td
bitCell
[ngClass]="{ 'tw-pl-20': i.addonSubscriptionItem }"
class="tw-align-middle"
>
<span *ngIf="!i.addonSubscriptionItem">{{ i.productName | i18n }} -</span>
{{ i.name }} {{ i.quantity > 1 ? "&times;" + i.quantity : "" }} &#64;
{{ i.amount | currency: "$" }}
@@ -91,7 +102,19 @@
{{ "freeForOneYear" | i18n }}
</ng-container>
<ng-template #calculateElse>
{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}
<div class="tw-flex tw-flex-col">
<span>
{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}
</span>
<span
*ngIf="customerDiscount?.percentOff && !isSecretsManagerTrial()"
class="tw-line-through !tw-text-muted"
>{{
calculateTotalAppliedDiscount(i.quantity * i.amount) | currency: "$"
}}
/ {{ "year" | i18n }}</span
>
</div>
</ng-template>
</td>
</tr>
@@ -112,7 +135,7 @@
</ng-container>
<ng-container *ngIf="userOrg.canEditSubscription">
<div class="tw-mt-7">
<div class="tw-mt-5">
<button
bitButton
buttonType="secondary"