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

Added changes for downgradenbug (#15045)

Browse Source
This commit is contained in:
cyprain-okeke
2025-06-10 07:50:00 +01:00
committed by GitHub
parent a368b70ab5
commit 159cca8cfa
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,13 +239,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
.organizations$(userId)
.pipe(getOrganizationById(this.organizationId)),
);
try {
const { accountCredit, paymentSource } =
await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
this.accountCredit = accountCredit;
this.paymentSource = paymentSource;
} catch (error) {
this.billingNotificationService.handleError(error);
if (this.sub?.subscription?.status !== "canceled") {
try {
const { accountCredit, paymentSource } =
await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
this.accountCredit = accountCredit;
this.paymentSource = paymentSource;
} catch (error) {
this.billingNotificationService.handleError(error);
}
}
}
@@ -317,8 +319,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
resolveHeaderName(subscription: OrganizationSubscriptionResponse): string {
if (subscription.subscription != null) {
this.isSubscriptionCanceled = subscription.subscription.cancelled;
if (subscription.subscription.cancelled) {
this.isSubscriptionCanceled =
subscription.subscription.cancelled && this.sub?.plan.productTier !== ProductTierType.Free;
if (this.isSubscriptionCanceled) {
return this.i18nService.t("restartSubscription");
}
}
@@ -767,7 +770,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
const doSubmit = async (): Promise<string> => {
let orgId: string = null;
if (this.sub?.subscription?.status === "canceled") {
const sub = this.sub?.subscription;
const isCanceled = sub?.status === "canceled";
const isCancelledDowngradedToFreeOrg =
sub?.cancelled && this.organization.productTierType === ProductTierType.Free;
if (isCanceled || isCancelledDowngradedToFreeOrg) {
await this.restartSubscription();
orgId = this.organizationId;
} else {

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

@@ -10,6 +10,7 @@
<app-subscription-status
[organizationSubscriptionResponse]="sub"
(reinstatementRequested)="reinstate()"
*ngIf="!userOrg.isFreeOrg"
></app-subscription-status>
<ng-container *ngIf="userOrg.canEditSubscription">
<div class="tw-flex-col">
@@ -25,7 +26,7 @@
>
<bit-table>
<ng-template body>
<ng-container *ngIf="subscription">
<ng-container *ngIf="subscription && !userOrg.isFreeOrg">
<tr bitRow *ngFor="let i of subscriptionLineItems">
<td
bitCell

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

@@ -496,9 +496,10 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
get showChangePlanButton() {
return (
!this.showChangePlan &&
this.sub.plan.productTier !== ProductTierType.Enterprise &&
!this.sub.subscription?.cancelled
(!this.showChangePlan &&
this.sub.plan.productTier !== ProductTierType.Enterprise &&
!this.sub.subscription?.cancelled) ||
(this.sub.subscription?.cancelled && this.sub.plan.productTier === ProductTierType.Free)
);
}