diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index e7978a9979..84898c0247 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -24,12 +24,12 @@ export default Component.extend({
return subscriptions.map((subscription) => {
return {
customer: subscription.customer,
- name: '',
+ name: subscription.name || '',
email: subscription.email || '',
status: subscription.status,
- startDate: '',
- planName: subscription.name,
- validUntil: moment(subscription.validUntil * 1000).format('MMM DD YYYY')
+ startDate: subscription.start_date ? moment(subscription.start_date).format('MMM DD YYYY') : '-',
+ plan: subscription.plan,
+ validUntil: subscription.current_period_end ? moment(subscription.current_period_end).format('MMM DD YYYY') : '-'
};
}).reverse();
}
diff --git a/ghost/admin/app/templates/components/gh-member-settings-form.hbs b/ghost/admin/app/templates/components/gh-member-settings-form.hbs
index ce9dabff16..044487cf5d 100644
--- a/ghost/admin/app/templates/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/templates/components/gh-member-settings-form.hbs
@@ -70,13 +70,17 @@
Stripe customer ID |
- {{subscription.customer}} |
+
+
+ {{subscription.customer.id}}
+
+ |
Name |
- {{#if subscription.name}}
- {{subscription.name}}
+ {{#if subscription.customer.name}}
+ {{subscription.customer.name}}
{{else}}
No name
{{/if}}
@@ -85,8 +89,8 @@
|
Email |
- {{#if subscription.email}}
- {{subscription.email}}
+ {{#if subscription.customer.email}}
+ {{subscription.customer.email}}
{{else}}
No email
{{/if}}
@@ -110,7 +114,7 @@
Plan |
- {{subscription.planName}} |
+ {{subscription.plan.nickname}} |
Current status |
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index ebcf26f3f6..5a003af96b 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "ghost-admin",
- "version": "2.33.0",
+ "version": "2.34.0",
"description": "Ember.js admin client for Ghost",
"author": "Ghost Foundation",
"homepage": "http://ghost.org",
|