Updated members detail design

no issue

- Fixed bug with incorrect member count
- Added basic stripe info section

ghost/admin/app/components/gh-member-settings-form.js

@@ -1,5 +1,7 @@
 import Component from '@ember/component';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
+import moment from 'moment';
+import {computed} from '@ember/object';
 import {inject as service} from '@ember/service';
 
 export default Component.extend({
@@ -8,7 +10,6 @@ export default Component.extend({
     mediaQueries: service(),
 
     isViewingSubview: false,
-
     scratchDescription: '',
 
     // Allowed actions
@@ -17,6 +18,20 @@ export default Component.extend({
 
     scratchName: boundOneWay('member.name'),
     scratchEmail: boundOneWay('member.email'),
+    subscription: computed('member.stripe', function () {
+        let subscriptions = this.member.get('stripe');
+        if (subscriptions && subscriptions.length > 0) {
+            let latestSubscription = subscriptions[0];
+            return {
+                customer: latestSubscription.customer,
+                name: latestSubscription.name,
+                status: latestSubscription.status,
+                validUntil: moment(latestSubscription.validUntil * 1000).format('MMM DD YYYY')
+            };
+        }
+        return null;
+    }),
+
     actions: {
         setProperty(property, value) {
             this.setProperty(property, value);

ghost/admin/app/controllers/member.js

@@ -14,23 +14,6 @@ export default Controller.extend({
 
     member: alias('model'),
 
-    subscription: computed('member.subscriptions', function () {
-        let subscriptions = this.member.get('subscriptions');
-        if (!subscriptions) {
-            return {
-                amount: '...',
-                status: '...',
-                plan: '...'
-            };
-        }
-        let subscription = subscriptions[0] || {};
-        return {
-            amount: subscription.amount ? (subscription.amount / 100) : 0,
-            status: subscription.status || '-',
-            plan: subscription.plan || 'Free'
-        };
-    }),
-
     subscribedAt: computed('member.createdAt', function () {
         let memberSince = moment(this.member.createdAt).from(moment());
         let createdDate = moment(this.member.createdAt).format('MMM DD, YYYY');

ghost/admin/app/controllers/members.js

@@ -41,17 +41,19 @@ export default Controller.extend({
             // fetch any records modified since last fetch
             results = yield this.store.query('member', {
                 limit: 'all',
-                filter: `updated_at:>='${moment.utc(this._lastFetchDate).format('YYYY-MM-DD HH:mm:ss')}'`
+                filter: `updated_at:>='${moment.utc(this._lastFetchDate).format('YYYY-MM-DD HH:mm:ss')}'`,
+                order: 'created_at desc'
             });
         } else {
             // fetch all records
             results = yield this.store.query('member', {
-                limit: 'all'
+                limit: 'all',
+                order: 'created_at desc'
             });
             this._hasFetchedAll = true;
+            this.set('meta', results.meta);
         }
 
-        this.set('meta', results.meta);
         this._lastFetchDate = newFetchDate;
     })
 });

ghost/admin/app/templates/components/gh-member-settings-form.hbs

@@ -11,7 +11,7 @@
                     tabindex="1"
                     input=(action (mut scratchName) value="target.value")
                     focus-out=(action 'setProperty' 'name' scratchName)}}
-        {{gh-error-message errors=tag.errors property="name"}}
+        {{gh-error-message errors=member.errors property="name"}}
         {{/gh-form-group}}
 
         {{#gh-form-group errors=member.errors hasValidated=member.hasValidated property="email"}}
@@ -28,7 +28,7 @@
 
     </div>
     <div class="mb6 mb0-ns w-100 w-50-ns">
-        {{#gh-form-group errors=member.errors hasValidated=tag.hasValidated property="note"}}
+        {{#gh-form-group errors=member.errors hasValidated=member.hasValidated property="note"}}
             <label for="member-description">Note</label>
             {{gh-textarea
                         disabled=true
@@ -40,8 +40,62 @@
                         input=(action (mut scratchDescription) value="target.value")
                         focus-out=(action 'setProperty' 'description' scratchDescription)
                     }}
-            {{gh-error-message errors=tag.errors property="description"}}
+            {{gh-error-message errors=member.errors property="description"}}
             <p>Maximum: <b>500</b> characters. You’ve used {{gh-count-down-characters scratchDescription 500}}</p>
         {{/gh-form-group}}
     </div>
+</div>
+
+<h4 class="midlightgrey f-small fw5 ttu mt15">Stripe info</h4>
+<div class="pa5 pb0 pt4 br4 shadow-1 bg-grouped-table mt2 flex flex-column flex-row-ns items-start justify-between gh-tag-basic-settings-form">
+    {{#if subscription}}
+        <div class="flex flex-column items-start mr8 w-100 w-50-ns">
+            {{#gh-form-group errors=member.errors hasValidated=member.hasValidated}}
+                <label for="member-customer-id">Stripe Customer Id</label>
+                {{gh-text-input
+                    disabled=true
+                    id="member-customer-id"
+                    name="member-customer-id"
+                    value=(readonly subscription.customer)
+                    tabindex="1"}}
+            {{/gh-form-group}}
+
+            {{#gh-form-group errors=member.errors hasValidated=member.hasValidated}}
+                <label for="member-customer-status">Subscription Status</label>
+                {{gh-text-input
+                    disabled=true
+                    value=(readonly subscription.status)
+                    id="member-customer-status"
+                    name="member-customer-status"
+                    tabindex="2"}}
+            {{/gh-form-group}}
+
+        </div>
+        <div class="mb6 mb0-ns w-100 w-50-ns">
+            {{#gh-form-group errors=member.errors hasValidated=member.hasValidated}}
+                <label for="member-plan-name">Subscription plan</label>
+                {{gh-text-input
+                    disabled=true
+                    value=(readonly subscription.name)
+                    id="member-plan-name"
+                    name="member-plan-name"
+                    tabindex="1"}}
+            {{/gh-form-group}}
+
+            {{#gh-form-group errors=member.errors hasValidated=member.hasValidated}}
+                <label for="member-plan-renewal">Renewal date</label>
+                {{gh-text-input
+                    disabled=true
+                    value=(readonly subscription.validUntil)
+                    id="member-plan-renewal"
+                    name="member-plan-renewal"
+                    tabindex="1"}}
+            {{/gh-form-group}}
+        </div>
+    {{else}}
+        <div class="flex flex-column items-start mr8 w-100 w-50-ns">
+            Non Paid member
+        </div>
+    {{/if}}
+
 </div>