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

Fixes the rescheduling of sending tasks

Browse Source
This commit is contained in:
Vlad
2018-03-24 11:35:16 -04:00
parent 18a6a1c439
commit a0947611fb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/API/JSON/v1/SendingQueue.php
View File

@ -56,11 +56,13 @@ class SendingQueue extends APIEndpoint {
APIError::NOT_FOUND => __('This newsletter is already being sent.', 'mailpoet') APIError::NOT_FOUND => __('This newsletter is already being sent.', 'mailpoet')
)); ));
} }
$task = SendingQueueModel::findTaskByNewsletterId($newsletter->id)
$scheduled_queue = SendingQueueModel::joinWithTasks()
->where('queues.newsletter_id', $newsletter->id)
->where('tasks.status', SendingQueueModel::STATUS_SCHEDULED) ->where('tasks.status', SendingQueueModel::STATUS_SCHEDULED)
->findOne(); ->findOne();
if($task) { if($scheduled_queue) {
$queue = SendingTask::createFromTask($task); $queue = SendingTask::createFromQueue($scheduled_queue);
} else { } else {
$queue = SendingTask::create(); $queue = SendingTask::create();
$queue->newsletter_id = $newsletter->id; $queue->newsletter_id = $newsletter->id;