- Rebases master and updates method names
This commit is contained in:
@ -72,8 +72,8 @@ class SendingQueue {
|
|||||||
if($queue->status === SendingQueueModel::STATUS_COMPLETED) {
|
if($queue->status === SendingQueueModel::STATUS_COMPLETED) {
|
||||||
$this->newsletter_task->markNewsletterAsSent($newsletter);
|
$this->newsletter_task->markNewsletterAsSent($newsletter);
|
||||||
}
|
}
|
||||||
// abort if sending limit is reached
|
// abort if sending limit has been reached
|
||||||
MailerLog::enforceSendingLimit();
|
MailerLog::enforceExecutionRequirements();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -120,8 +120,8 @@ class SendingQueue {
|
|||||||
$prepared_subscribers_ids = array();
|
$prepared_subscribers_ids = array();
|
||||||
$statistics = array();
|
$statistics = array();
|
||||||
}
|
}
|
||||||
// abort if sending limit is reached
|
// abort if sending limit has been reached
|
||||||
MailerLog::enforceSendingLimit();
|
MailerLog::enforceExecutionRequirements();
|
||||||
}
|
}
|
||||||
if($processing_method === 'bulk') {
|
if($processing_method === 'bulk') {
|
||||||
$queue = $this->sendNewsletters(
|
$queue = $this->sendNewsletters(
|
||||||
@ -159,7 +159,7 @@ class SendingQueue {
|
|||||||
$this->mailer_task->updateSentCount();
|
$this->mailer_task->updateSentCount();
|
||||||
// abort if sending limit has been reached
|
// abort if sending limit has been reached
|
||||||
if($queue->count_to_process) {
|
if($queue->count_to_process) {
|
||||||
MailerLog::enforceSendingLimit();
|
MailerLog::enforceExecutionRequirements();
|
||||||
}
|
}
|
||||||
return $queue;
|
return $queue;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user