diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs index a9e17cde93..2018c29a6b 100644 --- a/ghost/admin/app/components/gh-member-settings-form.hbs +++ b/ghost/admin/app/components/gh-member-settings-form.hbs @@ -168,7 +168,7 @@ {{#if subscription.cancelAtPeriodEnd}} Cancels on {{subscription.validUntil}} {{else}} - {{subscription.status}} + {{subscription.statusLabel}} {{/if}} diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js index 7da59d2c0d..99d8e1f28b 100644 --- a/ghost/admin/app/components/gh-member-settings-form.js +++ b/ghost/admin/app/components/gh-member-settings-form.js @@ -33,12 +33,14 @@ export default Component.extend({ let subscriptions = this.member.get('stripe'); if (subscriptions && subscriptions.length > 0) { return subscriptions.map((subscription) => { + const statusLabel = subscription.status === 'past_due' ? 'Past due' : subscription.status; return { id: subscription.id, customer: subscription.customer, name: subscription.name || '', email: subscription.email || '', status: subscription.status, + statusLabel: statusLabel, startDate: subscription.start_date ? moment(subscription.start_date).format('D MMM YYYY') : '-', plan: subscription.plan, amount: parseInt(subscription.plan.amount) ? (subscription.plan.amount / 100) : 0, diff --git a/ghost/admin/app/components/modal-delete-member.js b/ghost/admin/app/components/modal-delete-member.js index ac7cacc467..50e3b4d9d2 100644 --- a/ghost/admin/app/components/modal-delete-member.js +++ b/ghost/admin/app/components/modal-delete-member.js @@ -25,7 +25,7 @@ export default ModalComponent.extend({ } let firstActiveStripeSubscription = subscriptions.find((subscription) => { - return subscription.status === 'active' || subscription.status === 'trialing'; + return ['active', 'trialing', 'unpaid', 'past_due'].includes(subscription.status); }); return firstActiveStripeSubscription !== undefined;