- Remove space after if;
- Change Scheduler::standard function name to a more descriptive one
This commit is contained in:
@ -32,14 +32,12 @@ class Scheduler {
|
||||
->findOne($queue->newsletter_id);
|
||||
if(!$newsletter || $newsletter->deleted_at !== null) {
|
||||
$queue->delete();
|
||||
} else {
|
||||
if($newsletter->type === 'welcome') {
|
||||
$this->processWelcomeNewsletter($newsletter, $queue);
|
||||
} elseif($newsletter->type === 'notification') {
|
||||
$this->processPostNotificationNewsletter($newsletter, $queue);
|
||||
} elseif($newsletter->type === 'standard') {
|
||||
$this->processScheduledStandardNewsletter($newsletter, $queue);
|
||||
}
|
||||
} 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);
|
||||
}
|
||||
|
@ -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');
|
||||
}
|
||||
|
||||
|
@ -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 {
|
||||
|
Reference in New Issue
Block a user