From 8c712d62bfc1381c1228546ad597325cba6f2fd8 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 6 Jan 2021 11:56:15 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20blank=20data=20in=20memb?=
 =?UTF-8?q?er=20customer=20tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs https://github.com/TryGhost/Ghost-Admin/commit/772f5fa766febd8a6a0f1639299f1078d589b3bc

- when pulling the customer data display out of the subscriptions loop the data output was not updated to match
- adds a `customer` property to the `<GhMemberSettingsForm>` backing class that pulls the customer data from the first available subscription and adds the `startDate` property. Using the first available customer record works because there's a 1:1 mapping of member to stripe customer
---
 .../app/components/gh-member-settings-form.hbs  | 17 +++++++++--------
 .../app/components/gh-member-settings-form.js   | 10 ++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs
index 6767d78ac5..7f24c94c52 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -216,6 +216,7 @@
                                 </section>
                             {{/each}}
                         {{else}}
+
                             <section class="gh-member-stripe-info pa5 pb0 pt4 flex flex-column flex-row-ns items-start justify-between">
                                 <div class="flex items-start w-100">
                                     <div class="flex-auto">
@@ -223,16 +224,16 @@
                                             <tr class="gh-member-stripe-row">
                                                 <td class="gh-member-stripe-label">Stripe customer ID</td>
                                                 <td class="gh-member-stripe-data gh-member-stripe-id">
-                                                    <a href="https://dashboard.stripe.com/customers/{{subscription.customer.id}}" target="_blank" rel="noopener" data-tooltip="View on Stripe">
-                                                        {{subscription.customer.id}}
+                                                    <a href="https://dashboard.stripe.com/customers/{{customer.id}}" target="_blank" rel="noopener" data-tooltip="View on Stripe">
+                                                        {{customer.id}}
                                                     </a>
                                                 </td>
                                             </tr>
                                             <tr class="gh-member-stripe-row">
                                                 <td class="gh-member-stripe-label">Name</td>
                                                 <td class="gh-member-stripe-data">
-                                                    {{#if subscription.customer.name}}
-                                                        {{subscription.customer.name}}
+                                                    {{#if customer.name}}
+                                                        {{customer.name}}
                                                     {{else}}
                                                         <span class="midgrey-d1">No name</span>
                                                     {{/if}}
@@ -241,8 +242,8 @@
                                             <tr class="gh-member-stripe-row">
                                                 <td class="gh-member-stripe-label">Email</td>
                                                 <td class="gh-member-stripe-data gh-member-stripe-email">
-                                                    {{#if subscription.customer.email}}
-                                                        {{subscription.customer.email}}
+                                                    {{#if customer.email}}
+                                                        {{customer.email}}
                                                     {{else}}
                                                         <span class="midgrey-d1">No email</span>
                                                     {{/if}}
@@ -251,8 +252,8 @@
                                             <tr class="gh-member-stripe-row">
                                                 <td class="gh-member-stripe-label">Customer since</td>
                                                 <td class="gh-member-stripe-data">
-                                                    {{#if subscription.startDate}}
-                                                        {{subscription.startDate}}
+                                                    {{#if customer.startDate}}
+                                                        {{customer.startDate}}
                                                     {{else}}
                                                         <span class="midgrey-d1">No data</span>
                                                     {{/if}}
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index 5f6ded3f6b..eaca3a8bcf 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -56,6 +56,16 @@ export default Component.extend({
         return null;
     }),
 
+    customer: computed('subscriptions.[]', function () {
+        let customer = this.subscriptions.firstObject?.customer;
+        if (customer) {
+            return Object.assign({}, this.subscriptions.firstObject?.customer, {
+                startDate: this.subscriptions.firstObject?.startDate
+            });
+        }
+        return null;
+    }),
+
     actions: {
         setProperty(property, value) {
             this.setProperty(property, value);