TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 19:48:50 +03:00
Code Issues Projects Releases Wiki Activity

Refined members import modal

Browse Source 
no refs.
- fixed title logic
- fixed stripe validation message
This commit is contained in:
Peter Zimon 2020-07-09 12:11:30 +02:00
parent cf2f12e046
commit c611f65f53
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/admin/app/components/modal-import-members.hbs
View File

@ -2,13 +2,13 @@
<h1>
{{#if this.summary}}
Import complete{{unless this.importResponse.invalid.count "!"}}
{{/if}}
{{else}}
{{#if this.uploading}}
Importing members
{{else}}
Import members
{{/if}}
{{/if}}
</h1>
</header>
<a class="close" href="" role="button" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
@ -110,7 +110,7 @@
{{#if this.config.enableDeveloperExperiments}}
<ul class="ma0 pa0 mt4 list bt b--whitegrey">
{{#each this.importResponse.invalid.errors as |error|}}
<li class="gh-members-import-errormessage">{{error.message}} <span class="fw6">({{format-number error.count}})</span></li>
<li class="gh-members-import-errormessage">{{error.message}} <span class="fw4">({{format-number error.count}})</span></li>
{{/each}}
</ul>
{{/if}}

9
ghost/admin/app/services/member-import-validator.js
View File

@ -3,6 +3,7 @@ import Service, {inject as service} from '@ember/service';
import validator from 'validator';
import {formatNumber} from 'ghost-admin/helpers/format-number';
import {isEmpty} from '@ember/utils';
import {pluralize} from 'ember-inflector';
export default Service.extend({
ajax: service(),
@ -32,8 +33,8 @@ export default Service.extend({
if (!this.membersUtils.isStripeEnabled) {
validationErrors.push(new MemberImportError({
message: `Missing Stripe connection (${formatNumber(totalCount)})`,
context: `Stripe customers won't be imported. You need to <a href="#/settings/labs">connect to Stripe</a> to import stripe customers.`,
message: `Missing Stripe connection`,
context: `${formatNumber(totalCount)} ${pluralize(totalCount, 'Stripe customer', {withoutCount: true})} won't be imported. You need to <a href="#/settings/labs">connect to Stripe</a> to import Stripe customers.`,
type: 'warning'
}));
} else {
@ -49,7 +50,7 @@ export default Service.extend({
if (duplicateCount) {
validationErrors.push(new MemberImportError({
message: `Duplicate Stripe ID (${formatNumber(duplicateCount)})`,
message: `Duplicate Stripe ID <span class="fw4">(${formatNumber(duplicateCount)})</span>`,
type: 'warning'
}));
}
@ -65,7 +66,7 @@ export default Service.extend({
if (emptyCount) {
validationErrors.push(new MemberImportError({
message: `Missing email address (${formatNumber(emptyCount)})`,
message: `Missing email address <span class="fw4">(${formatNumber(emptyCount)})</span>`,
type: 'warning'
}));
}

2
ghost/admin/tests/integration/services/member-import-validator-test.js
View File

@ -57,7 +57,7 @@ describe('Integration: Service: member-import-validator', function () {
}]);
expect(validationErrors.length).to.equal(1);
expect(validationErrors[0].message).to.equal('Missing Stripe connection (1)');
expect(validationErrors[0].message).to.equal('Missing Stripe connection');
expect(mapping.email).to.equal('email');
expect(mapping.stripe_customer_id).to.equal('stripe_customer_id');
});