From 63fc06da2802cd955d9bcffc43ffb464f14a4c1b Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Tue, 9 Aug 2022 19:19:54 +0530
Subject: [PATCH] Added trial info on member subscription

refs https://github.com/TryGhost/Team/issues/1724

- shows free trial info in member detail page for subscription
---
 ghost/admin/app/components/gh-member-settings-form.hbs | 10 +++++++++-
 ghost/admin/app/components/gh-member-settings-form.js  |  9 ++++++++-
 2 files changed, 17 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 17f2b6742b..f16e5f9289 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -145,11 +145,19 @@
                                 <div class="gh-membertier-subscription" data-test-subscription={{index}}>
                                     <div>
                                         <div>
-                                            <span class="gh-cp-membertier-pricelabel">{{sub.price.nickname}}</span>
+                                            {{#if sub.trialUntil}}
+                                                <span class="gh-cp-membertier-pricelabel">Free Trial</span>
+                                            {{else}}
+                                                <span class="gh-cp-membertier-pricelabel">{{sub.price.nickname}}</span>
+                                            {{/if}}
+
                                             &ndash;
                                             {{#if (eq sub.status "canceled")}}
                                                 <span class="gh-cp-membertier-renewal">Ended {{sub.validUntil}}</span>
                                                 <span class="gh-badge archived" data-test-text="member-subscription-status">Cancelled</span>
+                                            {{else if sub.trialUntil}}
+                                                <span class="gh-cp-membertier-renewal">Ends {{sub.trialUntil}}</span>
+                                                <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
                                             {{else if sub.cancel_at_period_end}}
                                                 <span class="gh-cp-membertier-renewal">Has access until {{sub.validUntil}}</span>
                                                 <span class="gh-badge archived" data-test-text="member-subscription-status">Cancelled</span>
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index 4ffc670c24..266906d329 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -71,7 +71,7 @@ export default class extends Component {
         let subscriptionData = subscriptions.filter((sub) => {
             return !!sub.price;
         }).map((sub) => {
-            return {
+            const data = {
                 ...sub,
                 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') : '-',
@@ -83,6 +83,13 @@ export default class extends Component {
                 },
                 isComplimentary: !sub.id
             };
+            if (this.feature.get('freeTrial') && sub.trial_end_at) {
+                const inTrialMode = moment(sub.trial_end_at).isAfter(new Date(), 'day');
+                if (inTrialMode) {
+                    data.trialUntil = moment(sub.trial_end_at).format('D MMM YYYY');
+                }
+            }
+            return data;
         });
         return tiers.map((tier) => {
             let tierSubscriptions = subscriptionData.filter((subscription) => {