diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs
index a4da152d91..4eac44c1a0 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -123,9 +123,9 @@
{{tier.name}}
{{#if (eq sub.status "canceled")}}
- Cancelled
+ Canceled
{{else if sub.cancel_at_period_end}}
- Cancelled
+ Canceled
{{else if sub.compExpiry}}
Active
{{else if sub.trialUntil}}
@@ -147,9 +147,9 @@
{{/if}}
{{/if}}
- {{#if (eq sub.status "canceled")}}
+ {{#if sub.hasEnded}}
Ended {{sub.validUntil}}
- {{else if sub.cancel_at_period_end}}
+ {{else if sub.willEndSoon}}
Has access until {{sub.validUntil}}
{{else if sub.compExpiry}}
Expires {{sub.compExpiry}}
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index 467a240a24..8596af3b45 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -63,6 +63,7 @@ export default class extends Component {
let subscriptionData = subscriptions.filter((sub) => {
return !!sub.price;
}).map((sub) => {
+ const periodEnded = sub.current_period_end && new Date(sub.current_period_end) < new Date();
const data = {
...sub,
attribution: {
@@ -72,6 +73,8 @@ export default class extends Component {
},
startDate: sub.start_date ? moment(sub.start_date).format('D MMM YYYY') : '-',
validUntil: sub.current_period_end ? moment(sub.current_period_end).format('D MMM YYYY') : '-',
+ hasEnded: sub.status === 'canceled' && periodEnded,
+ willEndSoon: sub.cancel_at_period_end || (sub.status === 'canceled' && !periodEnded),
cancellationReason: sub.cancellation_reason,
price: {
...sub.price,