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

- Removes scheduling of post notification during newsletter activation stage

Browse Source
This commit is contained in:
Vlad
2016-07-14 20:29:36 -04:00
parent 7605fc71ac
commit db85604f18
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Router/SendingQueue.php
View File

@ -37,8 +37,10 @@ class SendingQueue {
); );
} }
if($newsletter->type === Newsletter::TYPE_WELCOME) { if($newsletter->type === Newsletter::TYPE_WELCOME ||
// set welcome email active $newsletter->type === Newsletter::TYPE_NOTIFICATION
) {
// set newsletter status to active
$result = $newsletter->setStatus(Newsletter::STATUS_ACTIVE); $result = $newsletter->setStatus(Newsletter::STATUS_ACTIVE);
$errors = $result->getErrors(); $errors = $result->getErrors();
@ -48,20 +50,16 @@ class SendingQueue {
'errors' => $errors 'errors' => $errors
); );
} else { } else {
$message = ($newsletter->type === Newsletter::TYPE_WELCOME) ?
__('Your welcome email has been activated') :
__('Your post notification has been activated');
return array( return array(
'result' => true, 'result' => true,
'data' => array( 'data' => array(
'message' => __('Your welcome email has been activated') 'message' => $message
) )
); );
} }
} else if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
// Post Notifications
$newsletter = Scheduler::processPostNotificationSchedule($newsletter->id);
Scheduler::createPostNotificationQueue($newsletter);
// set post notification active
$newsletter->setStatus(Newsletter::STATUS_ACTIVE);
} }
$queue = SendingQueueModel::whereNull('status') $queue = SendingQueueModel::whereNull('status')
@ -83,18 +81,6 @@ class SendingQueue {
$queue->newsletter_id = $newsletter->id; $queue->newsletter_id = $newsletter->id;
} }
if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
$queue->scheduled_at = Scheduler::getNextRunDate($newsletter->schedule);
$queue->status = SendingQueueModel::STATUS_SCHEDULED;
$queue->save();
return array(
'result' => true,
'data' => array(
'message' => __('Your post notification has been activated')
)
);
}
if((bool)$newsletter->isScheduled) { if((bool)$newsletter->isScheduled) {
// set newsletter status // set newsletter status
$newsletter->setStatus(Newsletter::STATUS_SCHEDULED); $newsletter->setStatus(Newsletter::STATUS_SCHEDULED);