From 7130fc28338352f3a1273bbe006141d8f4a1dd3e Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Wed, 10 Aug 2022 16:02:34 +0530
Subject: [PATCH] Wired free trial offer UI in offers list

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

- refines UI for a trial offer in offer list
---
 ghost/admin/app/controllers/offers.js |  6 +++++-
 ghost/admin/app/templates/offers.hbs  | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/controllers/offers.js b/ghost/admin/app/controllers/offers.js
index 634ebc0a0c..f9c7f17d08 100644
--- a/ghost/admin/app/controllers/offers.js
+++ b/ghost/admin/app/controllers/offers.js
@@ -44,7 +44,11 @@ export default class MembersController extends Controller {
             const price = offer.cadence === 'month' ? tier.monthlyPrice : tier.yearlyPrice;
             offer.finalCurrency = offer.currency || tier.currency;
             offer.originalPrice = price;
-            offer.updatedPrice = offer.type === 'fixed' ? (price - offer.amount) : (price - ((price * offer.amount) / 100));
+            if (offer.type !== 'trial') {
+                offer.updatedPrice = offer.type === 'fixed' ? (price - offer.amount) : (price - ((price * offer.amount) / 100));
+            } else {
+                offer.updatedPrice = offer.originalPrice;
+            }
             return offer;
         });
     }
diff --git a/ghost/admin/app/templates/offers.hbs b/ghost/admin/app/templates/offers.hbs
index 158b16213b..a9d52a53b3 100644
--- a/ghost/admin/app/templates/offers.hbs
+++ b/ghost/admin/app/templates/offers.hbs
@@ -64,17 +64,23 @@
                                 {{#if (feature 'freeTrial')}}
                                     {{#if (eq offer.type 'trial')}}
                                         <span class="pink">{{svg-jar "offer"}}</span>
-                                        <span class="pink fw6"><span class="ttu">21</span> DAYS FREE</span>
+                                        <span class="pink fw6"><span class="ttu">{{offer.amount}}</span> DAYS FREE</span>
                                     {{/if}}
                                 {{/if}}
-                                <span class="dib ml1 midgrey ttc"> – 
-                                    {{if (eq offer.duration 'once') "First-payment" "Repeating"}}
-                                </span>
+                                {{#if (not (eq offer.type 'trial'))}}
+                                    <span class="dib ml1 midgrey ttc"> – 
+                                        {{if (eq offer.duration 'once') "First-payment" "Repeating"}}
+                                    </span>
+                                {{/if}}
                             </span>
                         </LinkTo>
                         <LinkTo @route="offer" @model={{offer}} class="gh-list-data">
-                            <span>{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.updatedPrice}}</span>
-                            <span class="midgrey strike ml2">{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.originalPrice}}</span>
+                            {{#if (eq offer.type 'trial')}}
+                                <span>{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.originalPrice}}</span>
+                            {{else}}
+                                <span>{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.updatedPrice}}</span>
+                                <span class="midgrey strike ml2">{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.originalPrice}}</span>
+                            {{/if}}
                         </LinkTo>
                         <LinkTo @route="offer" @model={{offer}} class="gh-list-data">
                             <span class="midgrey">{{offer.redemptionCount}}</span>