From 1dd2b3349921c913a365bf2e713083edd3112d88 Mon Sep 17 00:00:00 2001
From: Rishabh Garg <zrishabhgarg@gmail.com>
Date: Wed, 25 Nov 2020 16:15:18 +0530
Subject: [PATCH] Updated Stripe Subscription status label handling (#1784)

refs https://github.com/TryGhost/Ghost/issues/12256

* Replace `_` in stripe's status with space to setup proper status label for subscriptions
* Displayed subscription status for cancelled subscriptions

Co-authored-by: Fabien O'Carroll <fabien@allou.is>
---
 ghost/admin/app/components/gh-member-settings-form.hbs | 2 +-
 ghost/admin/app/components/gh-member-settings-form.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs
index 9afae454dc..4f9fc19d33 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -165,7 +165,7 @@
                                 <tr>
                                     <td class="gh-member-stripe-label">Status</td>
                                     <td class="gh-member-stripe-data">
-                                        {{#if subscription.cancelAtPeriodEnd}}
+                                        {{#if (and subscription.cancelAtPeriodEnd (not-eq subscription.status 'canceled'))}}
                                             <span class="gh-member-cancels-on-label">Cancels on {{subscription.validUntil}}</span>
                                         {{else}}
                                             <span class="gh-member-stripe-status">{{subscription.statusLabel}}</span>
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index 75bd24b240..73c60f6869 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -33,7 +33,7 @@ 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;
+                const statusLabel = subscription.status ? subscription.status.replace('_', ' ') : '';
                 return {
                     id: subscription.id,
                     customer: subscription.customer,