From 092dbfa06964b2d739759f4b31fba4b22924e5b5 Mon Sep 17 00:00:00 2001 From: Pierre Brisorgueil Date: Sun, 15 Nov 2026 14:08:54 +0100 Subject: [PATCH] fix(billing): low-balance mail subject reads right with any unit word Closes #4280 --- modules/billing/README.md | 2 +- modules/billing/billing.email.js | 2 +- modules/billing/config/billing.development.config.js | 2 +- modules/billing/tests/billing.init.email-alerts.unit.tests.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/billing/README.md b/modules/billing/README.md index 34567b912..3b0e1a6c3 100644 --- a/modules/billing/README.md +++ b/modules/billing/README.md @@ -122,7 +122,7 @@ e.g. `500 * (1 - 80/100) = 99.99999999999997`, silently missing an exact boundar comparing the debit's own pre/post balance, and emits `billing.extras.balance_threshold_crossed` (`{ organizationId, threshold, remaining, planId }`). `billing.email.js` sends a credit-warning (80%) or credit-exhausted (100%) email off of it. -The subjects use `billing.alerts.balanceUnit` as a plural unit word (default `'credits'`); set it +The subjects use `billing.alerts.balanceUnit` as the unit word, plural or not (default `'credits'`); set it when your templates speak in another unit, so subject and body agree. - **Stateless — no `alertedAtN` field.** The weekly `alertedAt80`/`alertedAt100` fields diff --git a/modules/billing/billing.email.js b/modules/billing/billing.email.js index 54a9a6dfb..ec159751b 100644 --- a/modules/billing/billing.email.js +++ b/modules/billing/billing.email.js @@ -123,7 +123,7 @@ export const setupBillingEmails = () => { { to: email, subject: isWarning - ? `${appName} — your ${unit} are running low` + ? `${appName} — you are running low on ${unit}` : `${appName} — you are out of ${unit}`, template: isWarning ? 'billing-credit-warning' : 'billing-credit-exhausted', params: { diff --git a/modules/billing/config/billing.development.config.js b/modules/billing/config/billing.development.config.js index f28e9682d..f71209b55 100644 --- a/modules/billing/config/billing.development.config.js +++ b/modules/billing/config/billing.development.config.js @@ -137,7 +137,7 @@ const config = { }, alerts: { thresholdPercents: [80, 100], - // Plural unit word in the balance-alert mail subjects ("your credits are running low"). + // Unit word in the balance-alert mail subjects ("you are running low on credits"). balanceUnit: 'credits', }, events: { diff --git a/modules/billing/tests/billing.init.email-alerts.unit.tests.js b/modules/billing/tests/billing.init.email-alerts.unit.tests.js index c4af92afb..95ff1315b 100644 --- a/modules/billing/tests/billing.init.email-alerts.unit.tests.js +++ b/modules/billing/tests/billing.init.email-alerts.unit.tests.js @@ -386,7 +386,7 @@ describe('billing.email setupBillingEmails listeners:', () => { expect(mockMailer.sendMail).toHaveBeenCalledWith( expect.objectContaining({ to: 'owner@test.com', - subject: 'MyApp — your credits are running low', + subject: 'MyApp — you are running low on credits', template: 'billing-credit-warning', params: expect.objectContaining({ remaining: 100 }), }), @@ -422,7 +422,7 @@ describe('billing.email setupBillingEmails listeners:', () => { await new Promise((r) => setImmediate(r)); expect(mockMailer.sendMail).toHaveBeenCalledWith( - expect.objectContaining({ subject: 'MyApp — your tokens are running low' }), + expect.objectContaining({ subject: 'MyApp — you are running low on tokens' }), ); expect(mockMailer.sendMail).toHaveBeenCalledWith( expect.objectContaining({ subject: 'MyApp — you are out of tokens' }),