Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

[AC-2721] [Defect] Apply subscription status updates in provider subscription details (#9729)

Browse Source 
* Resolve the pending cancellation status

* Add the contact information
This commit is contained in:
cyprain-okeke 2024-06-20 13:50:10 +01:00 committed by GitHub
parent 8d04731633
commit 593dc3c716
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8426,5 +8426,8 @@
"example":"increments of 100,000"
}
}
},
"providerReinstate":{
"message": " Contact Customer Support to reinstate your subscription."
}
}

12
bitwarden_license/bit-web/src/app/billing/providers/subscription/subscription-status.component.ts
View File

@ -43,6 +43,10 @@ export class SubscriptionStatusComponent {
}
get status(): string {
if (this.subscription.cancelAt && this.subscription.status === "active") {
this.subscription.status = "pending_cancellation";
}
return this.subscription.status;
}
@ -151,13 +155,15 @@ export class SubscriptionStatusComponent {
},
date: {
label: cancellationDateLabel,
value: this.subscription.currentPeriodEndDate.toDateString(),
value: this.subscription.cancelAt,
},
callout: {
severity: "warning",
header: pendingCancellationText,
body: this.i18nService.t("subscriptionPendingCanceled"),
showReinstatementButton: true,
body:
this.i18nService.t("subscriptionPendingCanceled") +
this.i18nService.t("providerReinstate"),
showReinstatementButton: false,
},
};
}

2
libs/common/src/billing/models/response/provider-subscription-response.ts
View File

@ -9,6 +9,7 @@ export class ProviderSubscriptionResponse extends BaseResponse {
unpaidPeriodEndDate?: string;
gracePeriod?: number | null;
suspensionDate?: string;
cancelAt?: string;
constructor(response: any) {
super(response);
@ -19,6 +20,7 @@ export class ProviderSubscriptionResponse extends BaseResponse {
this.unpaidPeriodEndDate = this.getResponseProperty("unpaidPeriodEndDate");
this.gracePeriod = this.getResponseProperty("gracePeriod");
this.suspensionDate = this.getResponseProperty("suspensionDate");
this.cancelAt = this.getResponseProperty("cancelAt");
const plans = this.getResponseProperty("plans");
if (plans != null) {
this.plans = plans.map((i: any) => new ProviderPlanResponse(i));