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

Refactor to doctrine

Browse Source 
[MAILPOET-3876]
This commit is contained in:
Pavel Dohnal
2021-11-08 13:09:10 +01:00
committed by Veljko V
parent ee00f03ed3
commit 9229ed77d8
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,14 +120,13 @@ class SendingQueue extends APIEndpoint {
}
WordPress::resetRunInterval();
if ((bool)$newsletter->isScheduled) {
if ((bool)$newsletterEntity->getOptionValue('isScheduled')) {
// set newsletter status
$newsletter->setStatus(Newsletter::STATUS_SCHEDULED);
$newsletterEntity->setStatus(NewsletterEntity::STATUS_SCHEDULED);
// set queue status
$queue->status = SendingQueueModel::STATUS_SCHEDULED;
$queue->scheduledAt = Scheduler::formatDatetimeString($newsletter->scheduledAt);
$queue->scheduledAt = Scheduler::formatDatetimeString($newsletterEntity->getOptionValue('scheduledAt'));
} else {
$segments = $newsletter->segments()->findMany();
$subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($queue->task(), $segments);
@ -141,9 +140,10 @@ class SendingQueue extends APIEndpoint {
$queue->scheduledAt = null;
// set newsletter status
$newsletter->setStatus(Newsletter::STATUS_SENDING);
$newsletterEntity->setStatus(Newsletter::STATUS_SENDING);
}
$queue->save();
$this->newsletterRepository->flush();
$errors = $queue->getErrors();
if (!empty($errors)) {