aherman
/
bitwarden-clients
mirror of https://github.com/bitwarden/clients
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PM-29927] update reseller notifications (#19690)

Browse Source
pull/20071/head
Kyle Denney 1 month ago committed by GitHub
parent cb69c529b1
commit 2ab17d84d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File

32
apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
Unescape View File

@ -77,10 +77,14 @@ describe("OrganizationWarningsService", () => {
return "Your free trial ends today.";
case "resellerRenewalWarningMsg":
return `Your subscription will renew soon. To ensure uninterrupted service, contact ${args[0]} to confirm your renewal before ${args[1]}.`;
case "resellerRenewalWarningMsgV2":
return `Your subscription will renew soon. To ensure uninterrupted service, contact your Bitwarden provider to confirm your renewal before ${args[0]}.`;
case "resellerOpenInvoiceWarningMgs":
return `An invoice for your subscription was issued on ${args[1]}. To ensure uninterrupted service, contact ${args[0]} to confirm your renewal before ${args[2]}.`;
case "resellerPastDueWarningMsg":
return `The invoice for your subscription has not been paid. To ensure uninterrupted service, contact ${args[0]} to confirm your renewal before ${args[1]}.`;
case "resellerPastDueWarningMsgV2":
return `The invoice for your subscription has not been paid. To ensure uninterrupted service, contact your Bitwarden provider before ${args[0]}.`;
case "suspendedOrganizationTitle":
return `${args[0]} subscription suspended`;
case "close":
@ -247,18 +251,17 @@ describe("OrganizationWarningsService", () => {
expect(result).toEqual({
type: "info",
message: `Your subscription will renew soon. To ensure uninterrupted service, contact Test Reseller Inc to confirm your renewal before ${expectedFormattedDate}.`,
message: `Your subscription will renew soon. To ensure uninterrupted service, contact your Bitwarden provider to confirm your renewal before ${expectedFormattedDate}.`,
});
expect(i18nService.t).toHaveBeenCalledWith(
"resellerRenewalWarningMsg",
"Test Reseller Inc",
"resellerRenewalWarningMsgV2",
expectedFormattedDate,
);
done();
});
});
it("should return issued warning with correct type and message", (done) => {
it("should return null for issued warning type", (done) => {
const issuedDate = new Date(2024, 10, 15);
const dueDate = new Date(2024, 11, 15);
const warning = {
@ -270,19 +273,7 @@ describe("OrganizationWarningsService", () => {
} as OrganizationWarningsResponse);
service.getResellerRenewalWarning$(organization).subscribe((result) => {
const expectedIssuedDate = format(issuedDate);
const expectedDueDate = format(dueDate);
expect(result).toEqual({
type: "info",
message: `An invoice for your subscription was issued on ${expectedIssuedDate}. To ensure uninterrupted service, contact Test Reseller Inc to confirm your renewal before ${expectedDueDate}.`,
});
expect(i18nService.t).toHaveBeenCalledWith(
"resellerOpenInvoiceWarningMgs",
"Test Reseller Inc",
expectedIssuedDate,
expectedDueDate,
);
expect(result).toBeNull();
done();
});
});
@ -301,12 +292,11 @@ describe("OrganizationWarningsService", () => {
const expectedSuspensionDate = format(suspensionDate);
expect(result).toEqual({
type: "warning",
message: `The invoice for your subscription has not been paid. To ensure uninterrupted service, contact Test Reseller Inc to confirm your renewal before ${expectedSuspensionDate}.`,
type: "info",
message: `The invoice for your subscription has not been paid. To ensure uninterrupted service, contact your Bitwarden provider before ${expectedSuspensionDate}.`,
});
expect(i18nService.t).toHaveBeenCalledWith(
"resellerPastDueWarningMsg",
"Test Reseller Inc",
"resellerPastDueWarningMsgV2",
expectedSuspensionDate,
);
done();

18
apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
Unescape View File

@ -123,29 +123,19 @@ export class OrganizationWarningsService {
return {
type: "info",
message: this.i18nService.t(
"resellerRenewalWarningMsg",
organization.providerName,
"resellerRenewalWarningMsgV2",
format(warning.upcoming!.renewalDate),
),
};
}
case "issued": {
return {
type: "info",
message: this.i18nService.t(
"resellerOpenInvoiceWarningMgs",
organization.providerName,
format(warning.issued!.issuedDate),
format(warning.issued!.dueDate),
),
};
return null;
}
case "past_due": {
return {
type: "warning",
type: "info",
message: this.i18nService.t(
"resellerPastDueWarningMsg",
organization.providerName,
"resellerPastDueWarningMsgV2",
format(warning.pastDue!.suspensionDate),
),
};

18
apps/web/src/locales/en/messages.json
Unescape View File

@ -11958,6 +11958,15 @@
}
}
},
"resellerRenewalWarningMsgV2": {
"message": "Your subscription will renew soon. To ensure uninterrupted service, contact your Bitwarden provider to confirm your renewal before $RENEWAL_DATE$.",
"placeholders": {
"renewal_date": {
"content": "$1",
"example": "01/01/2024"
}
}
},
"resellerOpenInvoiceWarningMgs": {
"message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
"placeholders": {
@ -11988,6 +11997,15 @@
}
}
},
"resellerPastDueWarningMsgV2": {
"message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact your Bitwarden provider before $GRACE_PERIOD_END$.",
"placeholders": {
"grace_period_end": {
"content": "$1",
"example": "02/14/2024"
}
}
},
"restartOrganizationSubscription": {
"message": "Organization subscription restarted"
},

Write Preview
Loading…
Cancel
Save