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

Adds newsletter/cron scheduler for automatic emails

Browse Source
This commit is contained in:
Vlad
2018-04-29 20:10:13 -04:00
parent 116ee51497
commit b75d4db412
2 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Cron/Workers/Scheduler.php
View File

@@ -32,8 +32,7 @@ class Scheduler {
if(!count($scheduled_queues)) return false;
$this->updateTasks($scheduled_queues);
foreach($scheduled_queues as $i => $queue) {
$newsletter = Newsletter::filter('filterWithOptions')
->findOne($queue->newsletter_id);
$newsletter = Newsletter::filter('filterWithOptions')->findOne($queue->newsletter_id);
if(!$newsletter || $newsletter->deleted_at !== null) {
$queue->delete();
} elseif($newsletter->status !== Newsletter::STATUS_ACTIVE && $newsletter->status !== Newsletter::STATUS_SCHEDULED) {
@@ -44,6 +43,8 @@ class Scheduler {
$this->processPostNotificationNewsletter($newsletter, $queue);
} elseif($newsletter->type === Newsletter::TYPE_STANDARD) {
$this->processScheduledStandardNewsletter($newsletter, $queue);
} elseif($newsletter->type === Newsletter::TYPE_AUTOMATIC) {
$this->processScheduledAutomaticEmail($newsletter, $queue);
}
CronHelper::enforceExecutionLimit($this->timer);
}
@@ -101,6 +102,22 @@ class Scheduler {
return true;
}
function processScheduledAutomaticEmail($newsletter, $queue) {
if($newsletter->sendTo === 'segment') {
$segment = Segment::findOne($newsletter->segment)->asArray();
$finder = new SubscribersFinder();
$result = $finder->addSubscribersToTaskFromSegments($queue->task(), array($segment));
if(empty($result)) {
$queue->delete();
return false;
}
}
$queue->status = null;
$queue->save();
return true;
}
function processScheduledStandardNewsletter($newsletter, $queue) {
$segments = $newsletter->segments()->findArray();
$finder = new SubscribersFinder();