Removed free_months references from getDiscountWindow and callers

ref https://linear.app/ghost/issue/BER-3338

The `free_months` offer type was removed from the domain in #26571.
This cleans up the dead code paths that the rebase carried over.

Author: mike182uk

ghost/core/core/server/services/members/members-api/services/next-payment-calculator.js

@@ -102,11 +102,10 @@ class NextPaymentCalculator {
      */
     _getActiveDiscount(subscription, offer) {
         // Skip if there's no Stripe discount data and the offer isn't eligible for legacy backport:
-        // - free_months offers use trial periods (always eligible)
         // - signup offers are backported for legacy data without discount_start
         // - retention offers are excluded because they were introduced after discount_start
         //   was available, so missing discount_start means there's no active discount
-        if (!subscription.discount_start && offer.type !== 'free_months' && offer.redemption_type !== 'signup') {
+        if (!subscription.discount_start && offer.redemption_type !== 'signup') {
             return null;
         }
 

ghost/core/core/server/services/members/members-api/utils/get-discount-window.js

@@ -2,36 +2,16 @@
  * Computes the discount window for a subscription based on available data.
  * Returns {start, end} if a discount window can be determined, null otherwise.
  *
- * Handles three data paths:
- * 1. Free months offers - uses trial_start_at / trial_end_at
- * 2. Stripe coupon discounts (post-6.16) - uses discount_start / discount_end
- * 3. Legacy fallback - computes from offer duration and start_date
+ * Handles two data paths:
+ * 1. Stripe coupon discounts (post-6.16) - uses discount_start / discount_end
+ * 2. Legacy fallback - computes from offer duration and start_date
  *
- * @param {object} subscription - plain object with: discount_start, discount_end,
- *   trial_start_at, trial_end_at, start_date
- * @param {object|null} offer - offer data with: type, duration, duration_in_months.
+ * @param {object} subscription - plain object with: discount_start, discount_end, start_date
+ * @param {object|null} offer - offer data with: duration, duration_in_months.
  *   Pass null to skip offer-dependent checks.
  * @returns {{start: *, end: *}|null}
  */
 module.exports = function getDiscountWindow(subscription, offer) {
-    // Free months offers use trial periods in Stripe
-    if (offer?.type === 'free_months') {
-        if (!subscription.trial_end_at) {
-            return null;
-        }
-
-        const end = new Date(subscription.trial_end_at);
-
-        if (new Date() >= end) {
-            return null;
-        }
-
-        return {
-            start: subscription.trial_start_at,
-            end
-        };
-    }
-
     // Stripe coupon discount (post-6.16 data)
     if (subscription.discount_start) {
         return {

ghost/core/core/server/services/members/members-api/utils/has-active-offer.js

@@ -13,8 +13,6 @@ module.exports = async function hasActiveOffer(subscriptionModel, offersAPI) {
     const subscriptionData = {
         discount_start: subscriptionModel.get('discount_start'),
         discount_end: subscriptionModel.get('discount_end'),
-        trial_start_at: subscriptionModel.get('trial_start_at'),
-        trial_end_at: subscriptionModel.get('trial_end_at'),
         start_date: subscriptionModel.get('start_date')
     };
 
@@ -25,8 +23,9 @@ module.exports = async function hasActiveOffer(subscriptionModel, offersAPI) {
         return !discountWindow.end || new Date(discountWindow.end) > new Date();
     }
 
-    // Check for active trial (trial/free_months offers)
-    if (subscriptionData.trial_end_at && new Date(subscriptionData.trial_end_at) > new Date()) {
+    // Check for active trial (trial offers)
+    const trialEndAt = subscriptionModel.get('trial_end_at');
+    if (trialEndAt && new Date(trialEndAt) > new Date()) {
         return true;
     }
 

ghost/core/test/unit/server/services/members/members-api/utils/get-discount-window.test.js

@@ -6,66 +6,11 @@ describe('getDiscountWindow', function () {
         return {
             discount_start: null,
             discount_end: null,
-            trial_start_at: null,
-            trial_end_at: null,
             start_date: new Date('2025-01-01T00:00:00.000Z'),
             ...overrides
         };
     }
 
-    // Free months offers (trial-based)
-
-    describe('free months offers', function () {
-        it('returns window when trial is still active', function () {
-            const now = new Date();
-            const trialStart = new Date(now.getTime() - (7 * 24 * 60 * 60 * 1000));
-            const trialEnd = new Date(now.getTime() + (30 * 24 * 60 * 60 * 1000));
-            const subscription = createSubscription({
-                trial_start_at: trialStart,
-                trial_end_at: trialEnd
-            });
-
-            const result = getDiscountWindow(subscription, {type: 'free_months'});
-
-            assert.deepEqual(result, {start: trialStart, end: trialEnd});
-        });
-
-        it('returns null when trial has expired', function () {
-            const now = new Date();
-            const trialStart = new Date(now.getTime() - (60 * 24 * 60 * 60 * 1000));
-            const trialEnd = new Date(now.getTime() - (30 * 24 * 60 * 60 * 1000));
-            const subscription = createSubscription({
-                trial_start_at: trialStart,
-                trial_end_at: trialEnd
-            });
-
-            const result = getDiscountWindow(subscription, {type: 'free_months'});
-
-            assert.equal(result, null);
-        });
-
-        it('returns null when trial_end_at is missing', function () {
-            const subscription = createSubscription();
-
-            const result = getDiscountWindow(subscription, {type: 'free_months'});
-
-            assert.equal(result, null);
-        });
-
-        it('returns null for trial_start_at but uses fallback', function () {
-            const now = new Date();
-            const trialEnd = new Date(now.getTime() + (30 * 24 * 60 * 60 * 1000));
-            const subscription = createSubscription({
-                trial_start_at: null,
-                trial_end_at: trialEnd
-            });
-
-            const result = getDiscountWindow(subscription, {type: 'free_months'});
-
-            assert.deepEqual(result, {start: null, end: trialEnd});
-        });
-    });
-
     // Stripe coupon discount (post-6.16 data)
 
     describe('stripe coupon discount', function () {

ghost/core/test/unit/server/services/members/members-api/utils/has-active-offer.test.js

@@ -7,13 +7,12 @@ describe('hasActiveOffer', function () {
         sinon.restore();
     });
 
-    function createSubscriptionModel({discountStart = null, discountEnd = null, trialStartAt = null, trialEndAt = null, offerId = null, startDate = null} = {}) {
+    function createSubscriptionModel({discountStart = null, discountEnd = null, trialEndAt = null, offerId = null, startDate = null} = {}) {
         return {
             get: sinon.stub().callsFake((key) => {
                 const values = {
                     discount_start: discountStart,
                     discount_end: discountEnd,
-                    trial_start_at: trialStartAt,
                     trial_end_at: trialEndAt,
                     offer_id: offerId,
                     start_date: startDate