TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-28 05:14:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v3

Browse Source
This commit is contained in:
Kevin Ansfield 2019-10-10 10:17:44 +01:00
commit 26c48a52c2
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}

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

@ -70,13 +70,17 @@
<table class="gh-member-stripe-table">
<tr>
<td class="gh-member-stripe-label">Stripe customer ID</td>
<td class="gh-member-stripe-data"><a href="https://dashboard.stripe.com/test/customers/{{subscription.customer}}" target="_blank" rel="noopener" data-tooltip="View on Stripe">{{subscription.customer}}</a></td>
<td class="gh-member-stripe-data">
<a href="https://dashboard.stripe.com/test/customers/{{subscription.customer.id}}" target="_blank" rel="noopener" data-tooltip="View on Stripe">
{{subscription.customer.id}}
</a>
</td>
</tr>
<tr>
<td class="gh-member-stripe-label">Name</td>
<td class="gh-member-stripe-data">
{{#if subscription.name}}
{{subscription.name}}
{{#if subscription.customer.name}}
{{subscription.customer.name}}
{{else}}
<span class="midlightgrey-l2">No name</span>
{{/if}}
@ -85,8 +89,8 @@
<tr>
<td class="gh-member-stripe-label">Email</td>
<td class="gh-member-stripe-data">
{{#if subscription.email}}
{{subscription.email}}
{{#if subscription.customer.email}}
{{subscription.customer.email}}
{{else}}
<span class="midlightgrey-l2">No email</span>
{{/if}}
@ -110,7 +114,7 @@
<table class="gh-member-stripe-table">
<tr>
<td class="gh-member-stripe-label">Plan</td>
<td class="gh-member-stripe-data">{{subscription.planName}}</td>
<td class="gh-member-stripe-data">{{subscription.plan.nickname}}</td>
</tr>
<tr>
<td class="gh-member-stripe-label">Current status</td>

2
ghost/admin/package.json
View File

@ -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",