feat(payments-next): Update subscription reminder emails on discount change

elizabeth-ilina · elizabeth-ilina · commit 99c12c031065 · 2026-02-04T10:00:52.000-05:00
Because: * SubscriptionRenewalReminder doesn't handle the case where a customer’s discount is being replaced by a different discount. This commit: * Handles that case Closes #[PAY-3485](https://mozilla-hub.atlassian.net/browse/PAY-3485)
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.mjml b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.mjml
@@ -19,19 +19,17 @@
     </mj-text>
 
     <% if (locals.hadDiscount) { %>
-      <% if (locals.hasRenewalDiscount) { %>
     <mj-text css-class="text-body">
-      <span data-l10n-id="subscriptionRenewalReminder-content-discount-change">
-        Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied.
+      <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
+        Because a previous discount has ended, your subscription will renew at the standard price.
       </span>
     </mj-text>
-      <% } else { %>
+    <% } else if (locals.hasDifferentDiscount) { %>
     <mj-text css-class="text-body">
-      <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
-        Because a previous discount has ended, your subscription will renew at the standard price.
+      <span data-l10n-id="subscriptionRenewalReminder-content-discount-change">
+        Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied.
       </span>
     </mj-text>
-      <% } %>
     <% } %>
 
     <mj-text css-class="text-body">
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts
@@ -19,7 +19,7 @@ const data = {
   subscriptionSupportUrl: 'http://localhost:3030/support',
   updateBillingUrl: 'http://localhost:3030/subscriptions',
   hadDiscount: false,
-  hasRenewalDiscount: false,
+  hasDifferentDiscount: false,
 };
 
 const createStory = subplatStoryWithProps<TemplateData>(
@@ -59,15 +59,15 @@ export const YearlyPlanDiscountEnding = createStory(
     reminderLength: '15',
     invoiceTotal: '$199.99',
     hadDiscount: true,
-    hasRenewalDiscount: false,
+    hasDifferentDiscount: false,
   },
   'Yearly Plan - Discount Ending'
 );
 
 export const MonthlyPlanDiscountChanging = createStory(
   {
     hadDiscount: true,
-    hasRenewalDiscount: true,
+    hasDifferentDiscount: true,
     invoiceTotal: '$14.00',
   },
   'Monthly Plan - Discount Changing'
@@ -80,7 +80,7 @@ export const YearlyPlanDiscountChanging = createStory(
     reminderLength: '15',
     invoiceTotal: '$139.99',
     hadDiscount: true,
-    hasRenewalDiscount: true,
+    hasDifferentDiscount: true,
   },
   'Yearly Plan - Discount Changing'
 );
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.ts b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.ts
@@ -15,7 +15,7 @@ export type TemplateData = SubscriptionSupportContactTemplateData &
     subscriptionSupportUrl: string;
     updateBillingUrl: string;
     hadDiscount?: boolean;
-    hasRenewalDiscount?: boolean;
+    hasDifferentDiscount?: boolean;
   };
 
 export const template = 'subscriptionRenewalReminder';
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.txt b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.txt
@@ -7,11 +7,9 @@ subscriptionRenewalReminder-content-greeting = "Dear <%- productName %> customer
 subscriptionRenewalReminder-content-intro = "Your current subscription is set to automatically renew in <%- reminderLength %> days."
 
 <% if (locals.hadDiscount) { %>
-  <% if (locals.hasRenewalDiscount) { %>
-subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
-  <% } else { %>
 subscriptionRenewalReminder-content-discount-ending = "Because a previous discount has ended, your subscription will renew at the standard price."
-  <% } %>
+<% } else if (locals.hasDifferentDiscount) { %>
+subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
 <% } %>
 
 subscriptionRenewalReminder-content-charge = "At that time, Mozilla will renew your <%- planIntervalCount %> <%- planInterval %> subscription and a charge of <%- invoiceTotal %> will be applied to the payment method on your account."
diff --git a/packages/fxa-auth-server/lib/payments/subscription-reminders.ts b/packages/fxa-auth-server/lib/payments/subscription-reminders.ts
@@ -266,23 +266,25 @@ export class SubscriptionReminders {
   }
 
   /**
-   * Determine if a discount is ending by checking that the subscription currently
-   * has a discount but the upcoming invoice does not.
+   * Determine if a discount is ending by checking that a discount currently exists
+   * but will not be present on the upcoming invoice does not.
    */
   private hasDiscountEnding(
-    subscription: Stripe.Subscription,
-    invoicePreview: Stripe.UpcomingInvoice
+    currentDiscountId: string | null,
+    upcomingDiscountId: string | null,
   ): boolean {
-    return !!subscription.discount && !invoicePreview.discount;
+    return !!currentDiscountId && !upcomingDiscountId;
   }
 
   /**
-   * Determine if the upcoming invoice has a discount.
+   * Determine if the upcoming invoice has a discount that is different from
+   * the current discount.
    */
-  private hasRenewalDiscount(
-    invoicePreview: Stripe.UpcomingInvoice
+  private hasDifferentDiscount(
+    currentDiscountId: string | null,
+    upcomingDiscountId: string | null,
   ): boolean {
-    return !!invoicePreview.discount;
+    return !!currentDiscountId && !!upcomingDiscountId && currentDiscountId !== upcomingDiscountId;
   }
 
   /**
@@ -347,10 +349,28 @@ export class SubscriptionReminders {
           subscriptionId: subscription.id,
         });
 
+      // Check latest invoice for current discount
+      let latestInvoice = subscription.latest_invoice;
+      if (typeof latestInvoice === 'string') {
+        latestInvoice = await this.stripeHelper.getInvoice(latestInvoice);
+      }
+      const currentDiscount = latestInvoice?.discount || latestInvoice?.discounts?.[0];
+      const currentDiscountId = typeof currentDiscount === 'string'
+        ? currentDiscount
+        : currentDiscount?.id ?? null;
+
+      // Check upcoming invoice for upcoming discount
+      const upcomingDiscount = invoicePreview.discount || invoicePreview.discounts?.[0];
+      const upcomingDiscountId = upcomingDiscount
+        ? typeof upcomingDiscount === 'string'
+          ? upcomingDiscount
+          : upcomingDiscount.id
+        : null;
+
       // Detect if discount is ending
-      const hadDiscount = this.hasDiscountEnding(subscription, invoicePreview);
-      // Detect if renewal has a discount
-      const hasRenewalDiscount = this.hasRenewalDiscount(invoicePreview);
+      const hadDiscount = this.hasDiscountEnding(currentDiscountId, upcomingDiscountId);
+      // Detect if renewal has a different discount
+      const hasDifferentDiscount = this.hasDifferentDiscount(currentDiscountId, upcomingDiscountId);
 
       await this.mailer.sendSubscriptionRenewalReminderEmail(
         account.emails,
@@ -369,7 +389,7 @@ export class SubscriptionReminders {
           productMetadata: formattedSubscription.productMetadata,
           planConfig: formattedSubscription.planConfig,
           hadDiscount,
-          hasRenewalDiscount,
+          hasDifferentDiscount,
         }
       );
       await this.updateSentEmail(
diff --git a/packages/fxa-auth-server/lib/senders/email.js b/packages/fxa-auth-server/lib/senders/email.js
@@ -3253,7 +3253,7 @@ module.exports = function (log, config, bounces, statsd) {
           message.acceptLanguage
         ),
         hadDiscount: message.hadDiscount || false,
-        hasRenewalDiscount: message.hasRenewalDiscount || false,
+        hasDifferentDiscount: message.hasDifferentDiscount || false,
       },
     });
   };
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.mjml b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.mjml
@@ -19,19 +19,17 @@
     </mj-text>
 
     <% if (hadDiscount) { %>
-      <% if (hasRenewalDiscount) { %>
     <mj-text css-class="text-body">
-      <span data-l10n-id="subscriptionRenewalReminder-content-discount-change">
-        Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied.
+      <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
+        Because a previous discount has ended, your subscription will renew at the standard price.
       </span>
     </mj-text>
-      <% } else { %>
+    <% } else if (hasDifferentDiscount) { %>
     <mj-text css-class="text-body">
-      <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
-        Because a previous discount has ended, your subscription will renew at the standard price.
+      <span data-l10n-id="subscriptionRenewalReminder-content-discount-change">
+        Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied.
       </span>
     </mj-text>
-      <% } %>
     <% } %>
 
     <mj-text css-class="text-body">
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts
@@ -21,7 +21,7 @@ const createStory = subplatStoryWithProps(
     subscriptionSupportUrl: 'http://localhost:3030/support',
     updateBillingUrl: 'http://localhost:3030/subscriptions',
     hadDiscount: false,
-    hasRenewalDiscount: false,
+    hasDifferentDiscount: false,
   }
 );
 
@@ -55,15 +55,15 @@ export const YearlyPlanDiscountEnding = createStory(
     reminderLength: '15',
     invoiceTotal: '$199.99',
     hadDiscount: true,
-    hasRenewalDiscount: false,
+    hasDifferentDiscount: false,
   },
   'Yearly Plan - Discount Ending'
 );
 
 export const MonthlyPlanDiscountChanging = createStory(
   {
     hadDiscount: true,
-    hasRenewalDiscount: true,
+    hasDifferentDiscount: true,
     invoiceTotal: '$14.00',
   },
   'Monthly Plan - Discount Changing'
@@ -76,7 +76,7 @@ export const YearlyPlanDiscountChanging = createStory(
     reminderLength: '15',
     invoiceTotal: '$139.99',
     hadDiscount: true,
-    hasRenewalDiscount: true,
+    hasDifferentDiscount: true,
   },
   'Yearly Plan - Discount Changing'
 );
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.txt b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.txt
@@ -7,11 +7,9 @@ subscriptionRenewalReminder-content-greeting = "Dear <%- productName %> customer
 subscriptionRenewalReminder-content-intro = "Your current subscription is set to automatically renew in <%- reminderLength %> days."
 
 <% if (hadDiscount) { %>
-  <% if (hasRenewalDiscount) { %>
-subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
-  <% } else { %>
 subscriptionRenewalReminder-content-discount-ending = "Because a previous discount has ended, your subscription will renew at the standard price."
-  <% } %>
+<% } else if (hasDifferentDiscount) { %>
+subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
 <% } %>
 
 subscriptionRenewalReminder-content-charge = "At that time, Mozilla will renew your <%- planIntervalCount %> <%- planInterval %> subscription and a charge of <%- invoiceTotal %> will be applied to the payment method on your account."
diff --git a/packages/fxa-auth-server/test/local/payments/subscription-reminders.js b/packages/fxa-auth-server/test/local/payments/subscription-reminders.js
diff --git a/packages/fxa-auth-server/test/local/senders/emails.ts b/packages/fxa-auth-server/test/local/senders/emails.ts
