From 3bc06608b99c9757d3a3d767dc6bbdd990b69c90 Mon Sep 17 00:00:00 2001 From: Rish Date: Tue, 16 Apr 2019 22:59:52 +0530 Subject: [PATCH] Updated member detail screen to handle free memberships --- ghost/admin/app/controllers/member.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ghost/admin/app/controllers/member.js b/ghost/admin/app/controllers/member.js index 5df8f95581..c2257436ce 100644 --- a/ghost/admin/app/controllers/member.js +++ b/ghost/admin/app/controllers/member.js @@ -14,13 +14,19 @@ export default Controller.extend({ member: alias('model'), subscription: computed('member.subscriptions', function () { - let subscriptions = this.member.get('subscriptions') || []; + let subscriptions = this.member.get('subscriptions'); + if (!subscriptions) { + return { + amount: '...', + status: '...', + plan: '...' + }; + } let subscription = subscriptions[0] || {}; return { - amount: subscription.amount ? (subscription.amount / 100) : '...', - status: subscription.status || '...', + amount: subscription.amount ? (subscription.amount / 100) : 0, + status: subscription.status || '-', plan: subscription.plan || 'Free' - }; }),