Fixed retention offer not rendering for 1 mo repeating offers (#26748)

sagzy · web-flow · commit 643769ecb3ef · 2026-03-10T14:30:46.000+01:00
closes https://linear.app/ghost/issue/BER-3413 - when a member signs ups with a repeating 1 month offer, the next payment is not discounted - therefore, they should be able to redeem a retention offer
diff --git a/ghost/core/core/server/services/members/members-api/repositories/member-repository.js b/ghost/core/core/server/services/members/members-api/repositories/member-repository.js
@@ -1725,7 +1725,7 @@ module.exports = class MemberRepository {
         }
 
         // Check subscription doesn't already have an active offer
-        if (await hasActiveOffer(subscriptionModel, this._offersAPI)) {
+        if (await hasActiveOffer(subscriptionModel, this._offersAPI, options)) {
             throw new errors.BadRequestError({
                 message: tpl(messages.subscriptionHasOffer)
             });
diff --git a/ghost/core/core/server/services/members/members-api/utils/has-active-offer.js b/ghost/core/core/server/services/members/members-api/utils/has-active-offer.js
@@ -1,28 +1,24 @@
 const getDiscountWindow = require('./get-discount-window');
 
 /**
- * Determines if a subscription currently has an active offer.
+ * Determines if a subscription has an offer that still affects the next payment,
+ * or an active trial.
  * Uses discount_start/discount_end (synced from Stripe) when available,
  * falls back to offer duration lookup for legacy data (pre-6.16).
  *
  * @param {object} subscriptionModel - Bookshelf model for members_stripe_customers_subscriptions
  * @param {object} offersAPI - OffersAPI instance with getOffer()
+ * @param {object} [options] - Optional query options such as transacting
  * @returns {Promise<boolean>}
  */
-module.exports = async function hasActiveOffer(subscriptionModel, offersAPI) {
+module.exports = async function hasActiveOffer(subscriptionModel, offersAPI, options = {}) {
     const subscriptionData = {
         discount_start: subscriptionModel.get('discount_start'),
         discount_end: subscriptionModel.get('discount_end'),
-        start_date: subscriptionModel.get('start_date')
+        start_date: subscriptionModel.get('start_date'),
+        current_period_end: subscriptionModel.get('current_period_end')
     };
 
-    // Check for active Stripe discount (post-6.16 data)
-    // discount_start takes precedence over trial and legacy fallback
-    const discountWindow = getDiscountWindow(subscriptionData, null);
-    if (discountWindow) {
-        return !discountWindow.end || new Date(discountWindow.end) > new Date();
-    }
-
     // Check for active trial (trial offers)
     const trialEndAt = subscriptionModel.get('trial_end_at');
     if (trialEndAt && new Date(trialEndAt) > new Date()) {
@@ -37,14 +33,14 @@ module.exports = async function hasActiveOffer(subscriptionModel, offersAPI) {
 
     // Look up the offer to determine if it's still active based on duration
     try {
-        const offer = await offersAPI.getOffer({id: offerId});
+        const offer = await offersAPI.getOffer({id: offerId}, options);
         if (!offer) {
             return false;
         }
 
-        const legacyWindow = getDiscountWindow(subscriptionData, offer);
-        if (legacyWindow) {
-            return !legacyWindow.end || new Date(legacyWindow.end) > new Date();
+        const discountWindow = getDiscountWindow(subscriptionData, offer);
+        if (discountWindow) {
+            return !discountWindow.end || new Date(discountWindow.end) > new Date();
         }
 
         return false;
diff --git a/ghost/core/test/e2e-api/members/member-offers.test.js b/ghost/core/test/e2e-api/members/member-offers.test.js
@@ -403,6 +403,81 @@ describe('Members API - Member Offers', function () {
             }
         });
 
+        it('returns retention offers when a one-month repeating signup offer no longer applies to the next payment', async function () {
+            const {subscription} = await getMemberSubscription('paid@test.com');
+            const stripePrice = subscription.related('stripePrice');
+            const stripeProduct = stripePrice.related('stripeProduct');
+            const product = stripeProduct.related('product');
+
+            const tierId = product.id;
+            const cadence = stripePrice.get('interval');
+            const originalCurrentPeriodEnd = subscription.get('current_period_end');
+
+            const retentionOffer = await models.Offer.add({
+                name: 'Retention Offer After Repeating Signup',
+                code: 'retention-after-repeating-signup',
+                portal_title: '20% off',
+                portal_description: 'Stay with us!',
+                discount_type: 'percent',
+                discount_amount: 20,
+                duration: 'once',
+                interval: cadence,
+                product_id: null,
+                currency: null,
+                active: true,
+                redemption_type: 'retention'
+            });
+
+            const signupOffer = await models.Offer.add({
+                name: 'One Month Signup Offer',
+                code: 'one-month-signup-offer',
+                portal_title: '10% off for 1 month',
+                portal_description: 'Welcome!',
+                discount_type: 'percent',
+                discount_amount: 10,
+                duration: 'repeating',
+                duration_in_months: 1,
+                interval: cadence,
+                product_id: tierId,
+                currency: null,
+                active: true,
+                redemption_type: 'signup'
+            });
+
+            const now = new Date();
+            const currentPeriodEnd = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
+            const discountStart = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
+            const discountEnd = new Date(currentPeriodEnd);
+
+            await subscription.save({
+                offer_id: signupOffer.id,
+                discount_start: discountStart,
+                discount_end: discountEnd,
+                current_period_end: currentPeriodEnd
+            }, {patch: true});
+
+            try {
+                const token = await getIdentityToken('paid@test.com');
+
+                const {body} = await membersAgent
+                    .post('/api/member/offers')
+                    .body({identity: token})
+                    .expectStatus(200);
+
+                assert.equal(body.offers.length, 1);
+                assert.equal(body.offers[0].id, retentionOffer.id);
+            } finally {
+                await subscription.save({
+                    offer_id: null,
+                    discount_start: null,
+                    discount_end: null,
+                    current_period_end: originalCurrentPeriodEnd
+                }, {patch: true});
+                await models.Offer.destroy({id: retentionOffer.id});
+                await models.Offer.destroy({id: signupOffer.id});
+            }
+        });
+
         it('returns empty offers if subscription is already set to cancel', async function () {
             const {subscription} = await getMemberSubscription('paid@test.com');
             const stripePrice = subscription.related('stripePrice');
@@ -559,6 +634,151 @@ describe('Members API - Member Offers', function () {
             }
         });
 
+        it('allows applying a retention offer when a one-month repeating signup offer no longer applies to the next payment', async function () {
+            const {subscription} = await getMemberSubscription('paid@test.com');
+            const stripePrice = subscription.related('stripePrice');
+            const stripeProduct = stripePrice.related('stripeProduct');
+            const product = stripeProduct.related('product');
+
+            const stripeSubscriptionId = subscription.get('subscription_id');
+            const customerId = subscription.get('customer_id');
+            const tierId = product.id;
+            const cadence = stripePrice.get('interval');
+            const originalCurrentPeriodEnd = subscription.get('current_period_end');
+
+            const existingSignupOffer = await models.Offer.add({
+                name: 'Repeating Signup Offer',
+                code: 'repeating-signup-offer',
+                portal_title: '10% off for 1 month',
+                portal_description: 'Welcome!',
+                discount_type: 'percent',
+                discount_amount: 10,
+                duration: 'repeating',
+                duration_in_months: 1,
+                interval: cadence,
+                product_id: tierId,
+                currency: null,
+                active: true,
+                redemption_type: 'signup'
+            });
+
+            const stripeCouponId = 'coupon_redeem_after_repeating_signup';
+            mockManager.stripeMocker.coupons.push({
+                id: stripeCouponId,
+                object: 'coupon',
+                percent_off: 20,
+                duration: 'once'
+            });
+
+            const mockPrice = {
+                id: stripePrice.get('stripe_price_id'),
+                product: stripeProduct.get('stripe_product_id'),
+                active: true,
+                nickname: cadence,
+                unit_amount: stripePrice.get('amount'),
+                currency: stripePrice.get('currency'),
+                type: 'recurring',
+                recurring: {
+                    interval: cadence
+                }
+            };
+            mockManager.stripeMocker.prices.push(mockPrice);
+
+            mockManager.stripeMocker.customers.push({
+                id: customerId,
+                object: 'customer',
+                email: 'paid@test.com',
+                invoice_settings: {
+                    default_payment_method: null
+                },
+                subscriptions: {
+                    type: 'list',
+                    data: []
+                }
+            });
+
+            const now = new Date();
+            const currentPeriodEnd = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
+            const discountStart = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
+            const discountEnd = new Date(currentPeriodEnd);
+
+            mockManager.stripeMocker.subscriptions.push({
+                id: stripeSubscriptionId,
+                object: 'subscription',
+                status: 'active',
+                customer: customerId,
+                cancel_at_period_end: false,
+                current_period_end: Math.floor(currentPeriodEnd.getTime() / 1000),
+                start_date: Math.floor(discountStart.getTime() / 1000),
+                items: {
+                    data: [{
+                        id: 'si_test_repeating_signup',
+                        price: mockPrice
+                    }]
+                }
+            });
+
+            const retentionOffer = await models.Offer.add({
+                name: 'Retention Offer After Repeating Signup',
+                code: 'redeem-after-repeating-signup',
+                portal_title: '20% off',
+                portal_description: 'Stay with us!',
+                discount_type: 'percent',
+                discount_amount: 20,
+                duration: 'once',
+                interval: cadence,
+                product_id: null,
+                currency: null,
+                active: true,
+                redemption_type: 'retention',
+                stripe_coupon_id: stripeCouponId
+            });
+
+            await subscription.save({
+                offer_id: existingSignupOffer.id,
+                discount_start: discountStart,
+                discount_end: discountEnd,
+                current_period_end: currentPeriodEnd
+            }, {patch: true});
+
+            try {
+                const token = await getIdentityToken('paid@test.com');
+
+                await membersAgent
+                    .post(`/api/subscriptions/${stripeSubscriptionId}/apply-offer`)
+                    .body({identity: token, offer_id: retentionOffer.id})
+                    .expectStatus(204);
+
+                await DomainEvents.allSettled();
+
+                await subscription.refresh();
+                assert.equal(subscription.get('offer_id'), retentionOffer.id);
+
+                const redemption = await models.OfferRedemption.findOne({
+                    offer_id: retentionOffer.id,
+                    subscription_id: subscription.id
+                });
+                assert.ok(redemption, 'Offer redemption should be recorded');
+            } finally {
+                const redemption = await models.OfferRedemption.findOne({
+                    offer_id: retentionOffer.id,
+                    subscription_id: subscription.id
+                });
+                if (redemption) {
+                    await models.OfferRedemption.destroy({id: redemption.id});
+                }
+
+                await subscription.save({
+                    offer_id: null,
+                    discount_start: null,
+                    discount_end: null,
+                    current_period_end: originalCurrentPeriodEnd
+                }, {patch: true});
+                await models.Offer.destroy({id: retentionOffer.id});
+                await models.Offer.destroy({id: existingSignupOffer.id});
+            }
+        });
+
         it('returns 400 when offer cadence does not match subscription', async function () {
             const {subscription} = await getMemberSubscription('paid@test.com');
             const stripePrice = subscription.related('stripePrice');
diff --git a/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js b/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js
@@ -1512,7 +1512,17 @@ describe('RouterController', function () {
         let res;
         let responseData;
 
-        function createMockSubscription({id = 'sub_123', status = 'active', offerId = null, trialEndAt = null, discountStart = null, discountEnd = null, cancelAtPeriodEnd = false} = {}) {
+        function createMockSubscription({
+            id = 'sub_123',
+            status = 'active',
+            offerId = null,
+            trialEndAt = null,
+            discountStart = null,
+            discountEnd = null,
+            startDate = null,
+            currentPeriodEnd = new Date('2025-06-01T00:00:00.000Z'),
+            cancelAtPeriodEnd = false
+        } = {}) {
             return {
                 id,
                 get: sinon.stub().callsFake((key) => {
@@ -1522,6 +1532,8 @@ describe('RouterController', function () {
                         trial_end_at: trialEndAt,
                         discount_start: discountStart,
                         discount_end: discountEnd,
+                        start_date: startDate,
+                        current_period_end: currentPeriodEnd,
                         cancel_at_period_end: cancelAtPeriodEnd
                     };
                     return values[key] ?? null;
@@ -1603,6 +1615,8 @@ describe('RouterController', function () {
         });
 
         it('returns empty offers when subscription has an active discount', async function () {
+            mockOffersAPI.getOffer.resolves({id: 'existing_offer_123', duration: 'forever'});
+
             const routerController = createRouterController({
                 subscriptions: createMockSubscription({
                     offerId: 'existing_offer_123',
@@ -1622,6 +1636,7 @@ describe('RouterController', function () {
         it('returns offers when subscription has an expired discount', async function () {
             const mockOffer = {id: 'retention_offer'};
             mockOffersAPI.listOffersAvailableToSubscription.resolves([mockOffer]);
+            mockOffersAPI.getOffer.resolves({id: 'expired_offer_123', duration: 'once'});
 
             const pastDate = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
             const routerController = createRouterController({
@@ -1640,6 +1655,33 @@ describe('RouterController', function () {
             sinon.assert.calledOnce(mockOffersAPI.listOffersAvailableToSubscription);
         });
 
+        it('returns offers when a one-month repeating signup offer no longer applies to the next payment', async function () {
+            const mockOffer = {id: 'retention_offer'};
+            mockOffersAPI.listOffersAvailableToSubscription.resolves([mockOffer]);
+            mockOffersAPI.getOffer.resolves({
+                id: 'expiring_repeating_offer',
+                duration: 'repeating',
+                duration_in_months: 1
+            });
+
+            const routerController = createRouterController({
+                subscriptions: createMockSubscription({
+                    offerId: 'expiring_repeating_offer',
+                    startDate: new Date('2025-05-01T00:00:00.000Z'),
+                    discountStart: new Date('2025-05-01T00:00:00.000Z'),
+                    discountEnd: new Date('2025-06-01T00:00:00.000Z'),
+                    currentPeriodEnd: new Date('2025-06-01T00:00:00.000Z')
+                })
+            });
+
+            await routerController.getMemberOffers({
+                body: {identity: 'valid-token'}
+            }, res);
+
+            assert.deepEqual(responseData, {offers: [mockOffer]});
+            sinon.assert.calledOnce(mockOffersAPI.listOffersAvailableToSubscription);
+        });
+
         it('returns offers when subscription has expired once offer (legacy data, no discount_start)', async function () {
             const mockOffer = {id: 'retention_offer'};
             mockOffersAPI.listOffersAvailableToSubscription.resolves([mockOffer]);
diff --git a/ghost/core/test/unit/server/services/members/members-api/utils/has-active-offer.test.js b/ghost/core/test/unit/server/services/members/members-api/utils/has-active-offer.test.js

Original file line number	Diff line number	Diff line change
`@@ -1725,7 +1725,7 @@ module.exports = class MemberRepository {`
`1725`	`1725`	`}`
`1726`	`1726`
`1727`	`1727`	`// Check subscription doesn't already have an active offer`
`1728`		`- if (await hasActiveOffer(subscriptionModel, this._offersAPI)) {`
	`1728`	`+ if (await hasActiveOffer(subscriptionModel, this._offersAPI, options)) {`
`1729`	`1729`	`throw new errors.BadRequestError({`
`1730`	`1730`	`message: tpl(messages.subscriptionHasOffer)`
`1731`	`1731`	`});`