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

return sending queue object for standard / newsletter for automated\n- bugfix loading screen not going away\n- fixed not being used in sending queue endpoint

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-08-09 16:52:04 +02:00
parent 22e8e34213
commit f690e1a095
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,8 +108,9 @@ define(
} else { } else {
return response; return response;
} }
}).done((response) => { }).always(() => {
this.setState({ loading: false }); this.setState({ loading: false });
}).done((response) => {
// redirect to listing based on newsletter type // redirect to listing based on newsletter type
this.context.router.push(`/${ this.state.item.type || '' }`); this.context.router.push(`/${ this.state.item.type || '' }`);
// display success message depending on newsletter type // display success message depending on newsletter type
@ -118,7 +119,11 @@ define(
} else if (this.state.item.type === 'notification') { } else if (this.state.item.type === 'notification') {
MailPoet.Notice.success(MailPoet.I18n.t('postNotificationActivated')); MailPoet.Notice.success(MailPoet.I18n.t('postNotificationActivated'));
} else { } else {
MailPoet.Notice.success(MailPoet.I18n.t('newsletterBeingSent')); if (response.data.status === 'scheduled') {
MailPoet.Notice.success(MailPoet.I18n.t('newsletterHasBeenScheduled'));
} else {
MailPoet.Notice.success(MailPoet.I18n.t('newsletterBeingSent'));
}
} }
}).fail((response) => { }).fail((response) => {
if (response.errors.length > 0) { if (response.errors.length > 0) {

9
lib/API/Endpoints/SendingQueue.php
View File

@ -21,8 +21,7 @@ class SendingQueue extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : null); $id = (isset($data['id']) ? (int)$data['id'] : null);
// check that the newsletter exists // check that the newsletter exists
$newsletter = Newsletter::filter('filterWithOptions') $newsletter = Newsletter::filter('filterWithOptions')->findOne($id);
->findOne($data['id']);
if($newsletter === false) { if($newsletter === false) {
return $this->errorResponse(array( return $this->errorResponse(array(
@ -118,7 +117,7 @@ class SendingQueue extends APIEndpoint {
return $this->errorResponse($errors); return $this->errorResponse($errors);
} else { } else {
return $this->successResponse( return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray() $newsletter->getQueue()->asArray()
); );
} }
} }
@ -142,7 +141,7 @@ class SendingQueue extends APIEndpoint {
} else { } else {
$queue->pause(); $queue->pause();
return $this->successResponse( return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray() $newsletter->getQueue()->asArray()
); );
} }
} }
@ -166,7 +165,7 @@ class SendingQueue extends APIEndpoint {
} else { } else {
$queue->resume(); $queue->resume();
return $this->successResponse( return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray() $newsletter->getQueue()->asArray()
); );
} }
} }

1
views/newsletters.html
View File

@ -211,6 +211,7 @@
'next': __('Next'), 'next': __('Next'),
'previous': __('Previous'), 'previous': __('Previous'),
'newsletterBeingSent': __('The newsletter is being sent...'), 'newsletterBeingSent': __('The newsletter is being sent...'),
'newsletterHasBeenScheduled': __('The newsletter has been scheduled.'),
'welcomeEmailActivated': __('Your Welcome Email is now activated!'), 'welcomeEmailActivated': __('Your Welcome Email is now activated!'),
'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings'), 'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings'),
'postNotificationActivated': __('Your post notification is now active!'), 'postNotificationActivated': __('Your post notification is now active!'),