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

[PM-20300] Fix self-serve resubscribe bugs (#14296)

Browse Source 
* Address bugs

* Cy's feedback

* Cy's feedback
This commit is contained in:
Alex Morask
2025-04-28 14:38:48 -04:00
committed by GitHub
parent 17bc3e6501
commit ff846d2fab
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -983,7 +983,7 @@
</div> </div>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>
<button bitButton bitFormButton buttonType="primary" type="submit"> <button bitButton bitFormButton buttonType="primary" type="submit">
{{ "upgrade" | i18n }} {{ sub.subscription.status === "canceled" ? ("restart" | i18n) : ("upgrade" | i18n) }}
</button> </button>
<button bitButton buttonType="secondary" type="button" [bitDialogClose]="ResultType.Closed"> <button bitButton buttonType="secondary" type="button" [bitDialogClose]="ResultType.Closed">
{{ "cancel" | i18n }} {{ "cancel" | i18n }}

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

@@ -744,7 +744,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
const doSubmit = async (): Promise<string> => { const doSubmit = async (): Promise<string> => {
let orgId: string = null; let orgId: string = null;
if (this.isSubscriptionCanceled) { if (this.sub.subscription.status === "canceled") {
await this.restartSubscription(); await this.restartSubscription();
orgId = this.organizationId; orgId = this.organizationId;
} else { } else {

6
apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
View File

@@ -494,7 +494,11 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
}; };
get showChangePlanButton() { get showChangePlanButton() {
return this.sub.plan.productTier !== ProductTierType.Enterprise && !this.showChangePlan; return (
!this.showChangePlan &&
this.sub.plan.productTier !== ProductTierType.Enterprise &&
!this.sub.subscription.cancelled
);
} }
get canUseBillingSync() { get canUseBillingSync() {

3
apps/web/src/locales/en/messages.json
View File

@@ -10628,5 +10628,8 @@
}, },
"newBusinessUnit": { "newBusinessUnit": {
"message": "New business unit" "message": "New business unit"
},
"restart": {
"message": "Restart"
} }
} }