- Remove space after if;

- Change Scheduler::standard function name to a more descriptive one
This commit is contained in:
Tautvidas Sipavičius
2016-05-18 14:45:55 +03:00
parent 66a93768e1
commit 0b3a388a78
3 changed files with 14 additions and 10 deletions

View File

@ -32,15 +32,13 @@ class Scheduler {
->findOne($queue->newsletter_id);
if(!$newsletter || $newsletter->deleted_at !== null) {
$queue->delete();
} else {
if($newsletter->type === 'welcome') {
} elseif($newsletter->type === 'welcome') {
$this->processWelcomeNewsletter($newsletter, $queue);
} elseif($newsletter->type === 'notification') {
$this->processPostNotificationNewsletter($newsletter, $queue);
} elseif($newsletter->type === 'standard') {
$this->processScheduledStandardNewsletter($newsletter, $queue);
}
}
CronHelper::checkExecutionTimer($this->timer);
}
}

View File

@ -73,7 +73,11 @@ class Scheduler {
}
}
static function standard($timestamp) {
/**
* Create a properly formatted timestamp for use in Scheduler from
* arbitrarily formatted timestamp strings.
*/
static function scheduleFromTimestamp($timestamp) {
return Carbon::parse($timestamp)->format('Y-m-d H:i:s');
}

View File

@ -82,7 +82,9 @@ class SendingQueue {
if ((bool)$newsletter['isScheduled']) {
$queue->status = 'scheduled';
$queue->scheduled_at = Scheduler::standard($newsletter['scheduledAt']);
$queue->scheduled_at = Scheduler::scheduleFromTimestamp(
$newsletter['scheduledAt']
);
$message = __('The newsletter has been scheduled.');
} else {