From a6fa0bc0437de4ec312f6b74873a20e6abe0ce06 Mon Sep 17 00:00:00 2001 From: Fabien O'Carroll Date: Wed, 25 Sep 2019 13:31:33 +0700 Subject: [PATCH] Updated member.plans to member.stripe.subscriptions no-issue This is to support the new format in which stripe information is returned from the members-api module. --- core/frontend/services/themes/middleware.js | 2 +- .../server/api/canary/utils/serializers/output/utils/members.js | 2 +- core/server/api/v2/utils/serializers/output/utils/members.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/frontend/services/themes/middleware.js b/core/frontend/services/themes/middleware.js index f9f5983f73..55b4230ce6 100644 --- a/core/frontend/services/themes/middleware.js +++ b/core/frontend/services/themes/middleware.js @@ -80,7 +80,7 @@ function updateLocalTemplateOptions(req, res, next) { const member = req.member ? { email: req.member.email, - subscribed: req.member.plans.length !== 0 + subscribed: req.member.stripe.subscriptions.length !== 0 } : null; hbs.updateLocalTemplateOptions(res.locals, _.merge({}, localTemplateOptions, { diff --git a/core/server/api/canary/utils/serializers/output/utils/members.js b/core/server/api/canary/utils/serializers/output/utils/members.js index 880928015a..042bf6d061 100644 --- a/core/server/api/canary/utils/serializers/output/utils/members.js +++ b/core/server/api/canary/utils/serializers/output/utils/members.js @@ -22,7 +22,7 @@ function hideMembersOnlyContent(attrs, frame) { return BLOCK_CONTENT; } - const memberHasPlan = !!(frame.original.context.member.plans || []).length; + const memberHasPlan = !!(frame.original.context.member.stripe.subscriptions || []).length; if (!membersService.isPaymentConfigured()) { return PERMIT_CONTENT; } diff --git a/core/server/api/v2/utils/serializers/output/utils/members.js b/core/server/api/v2/utils/serializers/output/utils/members.js index 880928015a..2991cd2914 100644 --- a/core/server/api/v2/utils/serializers/output/utils/members.js +++ b/core/server/api/v2/utils/serializers/output/utils/members.js @@ -22,7 +22,7 @@ function hideMembersOnlyContent(attrs, frame) { return BLOCK_CONTENT; } - const memberHasPlan = !!(frame.original.context.member.plans || []).length; + const memberHasPlan = !!(frame.original.context.member.stripe.subscriptions).length; if (!membersService.isPaymentConfigured()) { return PERMIT_CONTENT; }