Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

updated sending queue endpoint + react (pause/resume/send)

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-08-09 14:23:41 +02:00
parent 4950e47297
commit 12b46736c5
4 changed files with 144 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/js/src/newsletters/listings/mixins.jsx
View File

@@ -8,7 +8,9 @@ const _QueueMixin = {
MailPoet.Ajax.post({
endpoint: 'sendingQueue',
action: 'pause',
data: newsletter.id
data: {
id: newsletter.id
}
}).done(function() {
jQuery('#resume_'+newsletter.id).show();
jQuery('#pause_'+newsletter.id).hide();
@@ -18,7 +20,9 @@ const _QueueMixin = {
MailPoet.Ajax.post({
endpoint: 'sendingQueue',
action: 'resume',
data: newsletter.id
data: {
id: newsletter.id
}
}).done(function() {
jQuery('#pause_'+newsletter.id).show();
jQuery('#resume_'+newsletter.id).hide();

32
assets/js/src/newsletters/send.jsx
View File

@@ -101,27 +101,31 @@ define(
return MailPoet.Ajax.post({
endpoint: 'sendingQueue',
action: 'add',
data: _.extend({}, this.state.item, {
newsletter_id: this.props.params.id,
}),
data: {
id: this.props.params.id
}
});
} else {
return response;
}
}).done((response) => {
this.setState({ loading: false });
if(response.result === true) {
this.context.router.push(`/${ this.state.item.type || '' }`);
MailPoet.Notice.success(response.data.message);
// redirect to listing based on newsletter type
this.context.router.push(`/${ this.state.item.type || '' }`);
// display success message depending on newsletter type
if (this.state.item.type === 'welcome') {
MailPoet.Notice.success(MailPoet.I18n.t('welcomeEmailActivated'));
} else if (this.state.item.type === 'notification') {
MailPoet.Notice.success(MailPoet.I18n.t('postNotificationActivated'));
} else {
if(response.errors) {
MailPoet.Notice.error(response.errors);
} else {
MailPoet.Notice.error(
MailPoet.I18n.t('newsletterSendingError').replace("%$1s", '?page=mailpoet-settings')
);
}
MailPoet.Notice.success(MailPoet.I18n.t('newsletterBeingSent'));
}
}).fail((response) => {
if (response.errors.length > 0) {
MailPoet.Notice.error(
response.errors.map(function(error) { return error.message; }),
{ scroll: true }
);
}
});
}