mirror of
https://github.com/bitwarden/browser
synced 2026-01-10 12:33:26 +00:00
* [AC-1423] Add minWidth input to bit-progress component * [AC-1423] Add ProgressModule to shared.module.ts * [AC-1423] Update cloud subscription page styles - Remove bootstrap styles - Use CL components where applicable - Use CL typography directives - Update heading levels to prepare for new SM sections * [AC-1423] Add usePasswordManager boolean to organization domain * [AC-1423] Introduce BitwardenProductType enum * [AC-1423] Update Organization subscription line items - Add product type prefix - Indent addon services like additional storage and service accounts - Show line items for free plans * [AC-1423] Simply sort function * [AC-1423] Remove header border * [AC-1423] Remove redundant condition * [AC-1423] Remove ineffective div * [AC-1423] Make "Password Manager" the default fallback for product name * Revert "[AC-1423] Add minWidth input to bit-progress component" This reverts commit95b2223a30. * [AC-1423] Remove minWidth attribute * [AC-1423] Switch to AddonProductType enum instead of boolean * Revert "[AC-1423] Switch to AddonProductType enum instead of boolean" This reverts commit204f64b4e7. * [AC-1423] Tweak sorting comment * [AC-1418] Add initial SecretsManagerAdjustSubscription component * [AC-1418] Add initial SM adjustment form * [AC-1418] Adjust organization-subscription-update.request.ts to support both PM and SM * [AC-1418] Rename service account fields in the options interface * [AC-1418] Add api service call to update SM subscription * [AC-1418] Cleanup form html * [AC-1418] Add missing SM plan properties * [AC-1418] Add SM subscription adjust form and logic to hide it * [AC-1418] Add better docs to options interface * [AC-1418] Fix conflicting required/optional labels for auto-scaling limits * [AC-1418] Adjust labels and appearance to better match design * [AC-1418] Use the SM plan for billing interval * [AC-1418] Hide SM billing adjustment component behind feature flag * [AC-1418] Update request model to match server * [AC-1418] Cleanup BitwardenProductType after merge Add to barrel file and update applicable imports. * [AC-1418] Revert change to update PM subscription request model * [AC-1418] Add new update SM subscription request model * [AC-1418] Add new service method to update SM subscription * [AC-1418] Use new model and service method * [AC-1418] Cleanup SM subscription UI flags * [AC-1418] Move SM adjust subscription component into SM billing module * [AC-1418] Update SM seat count minimum to 1 * [AC-1418] Add missing currency codes * [AC-1418] Simplify monthly price calculation * [AC-1418] Increase PM adjust subscription form input width * [AC-1418] Add check for null subscription --------- Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
240 lines
8.2 KiB
HTML
240 lines
8.2 KiB
HTML
<div class="tw-mb-2">
|
|
<h1 bitTypography="h1">
|
|
{{ "subscription" | i18n }}
|
|
<small *ngIf="firstLoaded && loading">
|
|
<i
|
|
class="bwi bwi-spinner bwi-spin text-muted"
|
|
title="{{ 'loading' | i18n }}"
|
|
aria-hidden="true"
|
|
></i>
|
|
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
|
|
</small>
|
|
</h1>
|
|
</div>
|
|
<ng-container *ngIf="!firstLoaded && loading">
|
|
<i class="bwi bwi-spinner bwi-spin text-muted" title="{{ 'loading' | i18n }}"></i>
|
|
<span class="sr-only">{{ "loading" | i18n }}</span>
|
|
</ng-container>
|
|
|
|
<app-org-subscription-hidden
|
|
*ngIf="firstLoaded && !userOrg.canViewSubscription"
|
|
[providerName]="userOrg.providerName"
|
|
></app-org-subscription-hidden>
|
|
|
|
<ng-container *ngIf="sub && firstLoaded">
|
|
<bit-callout
|
|
type="warning"
|
|
title="{{ 'canceled' | i18n }}"
|
|
*ngIf="subscription && subscription.cancelled"
|
|
>
|
|
{{ "subscriptionCanceled" | i18n }}</bit-callout
|
|
>
|
|
<bit-callout
|
|
type="warning"
|
|
title="{{ 'pendingCancellation' | i18n }}"
|
|
*ngIf="subscriptionMarkedForCancel"
|
|
>
|
|
<p>{{ "subscriptionPendingCanceled" | i18n }}</p>
|
|
<button bitButton buttonType="secondary" [bitAction]="reinstate" type="button">
|
|
{{ "reinstateSubscription" | i18n }}
|
|
</button>
|
|
</bit-callout>
|
|
|
|
<dl class="tw-grid tw-grid-flow-col tw-grid-rows-2">
|
|
<dt>{{ "billingPlan" | i18n }}</dt>
|
|
<dd>{{ sub.plan.name }}</dd>
|
|
<ng-container *ngIf="subscription">
|
|
<dt>{{ "status" | i18n }}</dt>
|
|
<dd>
|
|
<span class="tw-capitalize">{{
|
|
isSponsoredSubscription ? "sponsored" : subscription.status || "-"
|
|
}}</span>
|
|
<span bitBadge badgeType="warning" *ngIf="subscriptionMarkedForCancel">{{
|
|
"pendingCancellation" | i18n
|
|
}}</span>
|
|
</dd>
|
|
<dt [ngClass]="{ 'tw-text-danger': isExpired }">
|
|
{{ "subscriptionExpiration" | i18n }}
|
|
</dt>
|
|
<dd [ngClass]="{ 'tw-text-danger': isExpired }">
|
|
{{ nextInvoice ? (nextInvoice.date | date : "mediumDate") : "-" }}
|
|
</dd>
|
|
</ng-container>
|
|
</dl>
|
|
<ng-container *ngIf="userOrg.canEditSubscription">
|
|
<div class="tw-mb-7 tw-flex-col">
|
|
<strong class="tw-block tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300">{{
|
|
"details" | i18n
|
|
}}</strong>
|
|
<bit-table>
|
|
<ng-template body>
|
|
<ng-container *ngIf="subscription">
|
|
<tr bitRow *ngFor="let i of lineItems">
|
|
<td bitCell [ngClass]="{ 'tw-pl-20': i.addonSubscriptionItem }">
|
|
<span *ngIf="!i.addonSubscriptionItem"
|
|
>{{ productName(i.bitwardenProduct) }} -</span
|
|
>
|
|
{{ i.name }} {{ i.quantity > 1 ? "×" + i.quantity : "" }} @
|
|
{{ i.amount | currency : "$" }}
|
|
</td>
|
|
<td bitCell class="tw-text-right">
|
|
{{ i.quantity * i.amount | currency : "$" }} /{{ i.interval | i18n }}
|
|
</td>
|
|
</tr>
|
|
</ng-container>
|
|
<ng-container *ngIf="userOrg.isFreeOrg">
|
|
<tr bitRow *ngIf="userOrg.usePasswordManager">
|
|
<td bitCell>{{ "passwordManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
|
|
<td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
|
|
</tr>
|
|
<tr bitRow *ngIf="userOrg.useSecretsManager">
|
|
<td bitCell>{{ "secretsManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
|
|
<td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
|
|
</tr>
|
|
</ng-container>
|
|
</ng-template>
|
|
</bit-table>
|
|
</div>
|
|
</ng-container>
|
|
|
|
<ng-container *ngIf="userOrg.canEditSubscription">
|
|
<button
|
|
bitButton
|
|
buttonType="secondary"
|
|
type="button"
|
|
(click)="changePlan()"
|
|
*ngIf="showChangePlanButton"
|
|
>
|
|
{{ "changeBillingPlan" | i18n }}
|
|
</button>
|
|
<app-change-plan
|
|
[organizationId]="organizationId"
|
|
(onChanged)="closeChangePlan()"
|
|
(onCanceled)="closeChangePlan()"
|
|
*ngIf="showChangePlan"
|
|
></app-change-plan>
|
|
</ng-container>
|
|
|
|
<ng-container *ngIf="showSecretsManagerSubscribe">
|
|
<sm-subscribe-standalone
|
|
[plan]="sub.secretsManagerPlan"
|
|
[organization]="userOrg"
|
|
(onSubscribe)="subscriptionAdjusted()"
|
|
></sm-subscribe-standalone>
|
|
</ng-container>
|
|
|
|
<ng-container *ngIf="userOrg.canEditSubscription">
|
|
<h2 bitTypography="h2" class="tw-mt-7">{{ "manageSubscription" | i18n }}</h2>
|
|
<p bitTypography="body1">{{ subscriptionDesc }}</p>
|
|
<ng-container
|
|
*ngIf="
|
|
subscription && canAdjustSeats && !subscription.cancelled && !subscriptionMarkedForCancel
|
|
"
|
|
>
|
|
<h3 bitTypography="h3" class="tw-mt-7">{{ "passwordManager" | i18n }}</h3>
|
|
<app-adjust-subscription
|
|
[seatPrice]="seatPrice"
|
|
[organizationId]="organizationId"
|
|
[interval]="billingInterval"
|
|
[currentSeatCount]="seats"
|
|
[maxAutoscaleSeats]="maxAutoscaleSeats"
|
|
(onAdjusted)="subscriptionAdjusted()"
|
|
>
|
|
</app-adjust-subscription>
|
|
</ng-container>
|
|
<button
|
|
bitButton
|
|
buttonType="danger"
|
|
type="button"
|
|
[bitAction]="removeSponsorship"
|
|
*ngIf="isSponsoredSubscription"
|
|
>
|
|
{{ "removeSponsorship" | i18n }}
|
|
</button>
|
|
<h4 bitTypography="h4" class="tw-mt-9">{{ "storage" | i18n }}</h4>
|
|
<p bitTypography="body1">
|
|
{{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}
|
|
</p>
|
|
<bit-progress [barWidth]="storagePercentage" bgColor="success"></bit-progress>
|
|
<ng-container *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
|
|
<div class="tw-mt-3">
|
|
<div class="tw-flex tw-space-x-2" *ngIf="!showAdjustStorage">
|
|
<button bitButton buttonType="secondary" type="button" (click)="adjustStorage(true)">
|
|
{{ "addStorage" | i18n }}
|
|
</button>
|
|
<button bitButton buttonType="secondary" type="button" (click)="adjustStorage(false)">
|
|
{{ "removeStorage" | i18n }}
|
|
</button>
|
|
</div>
|
|
<app-adjust-storage
|
|
[storageGbPrice]="storageGbPrice"
|
|
[add]="adjustStorageAdd"
|
|
[organizationId]="organizationId"
|
|
[interval]="billingInterval"
|
|
(onAdjusted)="closeStorage(true)"
|
|
(onCanceled)="closeStorage(false)"
|
|
*ngIf="showAdjustStorage"
|
|
></app-adjust-storage>
|
|
</div>
|
|
</ng-container>
|
|
<ng-container *ngIf="showAdjustSecretsManager">
|
|
<h3 bitTypography="h3" class="tw-mt-9">{{ "secretsManager" | i18n }}</h3>
|
|
<app-sm-adjust-subscription
|
|
[organizationId]="organizationId"
|
|
[options]="smOptions"
|
|
(onAdjusted)="subscriptionAdjusted()"
|
|
></app-sm-adjust-subscription>
|
|
</ng-container>
|
|
</ng-container>
|
|
|
|
<h2 bitTypography="h2" class="tw-mt-7">{{ "selfHostingTitle" | i18n }}</h2>
|
|
<p bitTypography="body1">
|
|
{{ "selfHostingEnterpriseOrganizationSectionCopy" | i18n }}
|
|
</p>
|
|
<div class="tw-flex tw-space-x-2">
|
|
<button
|
|
bitButton
|
|
buttonType="secondary"
|
|
type="button"
|
|
(click)="downloadLicense()"
|
|
*ngIf="canDownloadLicense"
|
|
[disabled]="showDownloadLicense"
|
|
>
|
|
{{ "downloadLicense" | i18n }}
|
|
</button>
|
|
<button
|
|
bitButton
|
|
buttonType="secondary"
|
|
type="button"
|
|
(click)="manageBillingSync()"
|
|
*ngIf="canManageBillingSync"
|
|
>
|
|
{{ (hasBillingSyncToken ? "manageBillingSync" : "setUpBillingSync") | i18n }}
|
|
</button>
|
|
</div>
|
|
<div class="tw-mt-3" *ngIf="showDownloadLicense">
|
|
<app-download-license
|
|
[organizationId]="organizationId"
|
|
(onDownloaded)="closeDownloadLicense()"
|
|
(onCanceled)="closeDownloadLicense()"
|
|
></app-download-license>
|
|
</div>
|
|
<ng-container *ngIf="userOrg.canEditSubscription">
|
|
<h2 bitTypography="h2" class="tw-mt-7">{{ "additionalOptions" | i18n }}</h2>
|
|
<p bitTypography="body1">
|
|
{{ "additionalOptionsDesc" | i18n }}
|
|
</p>
|
|
<div class="tw-flex tw-space-x-2">
|
|
<button
|
|
bitButton
|
|
buttonType="danger"
|
|
[bitAction]="cancel"
|
|
type="button"
|
|
*ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
|
|
>
|
|
{{ "cancelSubscription" | i18n }}
|
|
</button>
|
|
</div>
|
|
</ng-container>
|
|
</ng-container>
|