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

Schedule authorized emails check on update

Browse Source 
[MAILPOET-1987]
This commit is contained in:
Rostislav Wolny
2019-05-10 10:18:41 +02:00
committed by M. Shull
parent 7711e7fed1
commit 67b90ca228
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Config/Populator.php
View File

@@ -4,6 +4,7 @@ namespace MailPoet\Config;
use Carbon\Carbon; use Carbon\Carbon;
use MailPoet\Config\PopulatorData\DefaultForm; use MailPoet\Config\PopulatorData\DefaultForm;
use MailPoet\Cron\CronTrigger; use MailPoet\Cron\CronTrigger;
use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck;
use MailPoet\Cron\Workers\InactiveSubscribers; use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Models\NewsletterTemplate; use MailPoet\Models\NewsletterTemplate;
@@ -16,6 +17,7 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\UserFlag; use MailPoet\Models\UserFlag;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\Segments\WP; use MailPoet\Segments\WP;
use MailPoet\Services\Bridge;
use MailPoet\Settings\Pages; use MailPoet\Settings\Pages;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscribers\NewSubscriberNotificationMailer; use MailPoet\Subscribers\NewSubscriberNotificationMailer;
@@ -136,6 +138,7 @@ class Populator {
$this->updateNewsletterCategories(); $this->updateNewsletterCategories();
$this->updateMetaFields(); $this->updateMetaFields();
$this->scheduleInitialInactiveSubscribersCheck(); $this->scheduleInitialInactiveSubscribersCheck();
$this->scheduleAuthorizedSendingEmailsCheck();
// Will be uncommented on task [MAILPOET-1998] // Will be uncommented on task [MAILPOET-1998]
// $this->updateFormsSuccessMessages(); // $this->updateFormsSuccessMessages();
} }
@@ -530,17 +533,33 @@ class Populator {
} }
private function scheduleInitialInactiveSubscribersCheck() { private function scheduleInitialInactiveSubscribersCheck() {
$task = ScheduledTask::where('type', InactiveSubscribers::TASK_TYPE) $this->scheduleTask(
InactiveSubscribers::TASK_TYPE,
Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHour()
);
}
private function scheduleAuthorizedSendingEmailsCheck() {
if (!Bridge::isMPSendingServiceEnabled()) {
return;
}
$this->scheduleTask(
AuthorizedSendingEmailsCheck::TASK_TYPE,
Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))
);
}
private function scheduleTask($type, $datetime) {
$task = ScheduledTask::where('type', $type)
->whereRaw('status = ? OR status IS NULL', [ScheduledTask::STATUS_SCHEDULED]) ->whereRaw('status = ? OR status IS NULL', [ScheduledTask::STATUS_SCHEDULED])
->findOne(); ->findOne();
if ($task) { if ($task) {
return true; return true;
} }
$datetime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
$task = ScheduledTask::create(); $task = ScheduledTask::create();
$task->type = InactiveSubscribers::TASK_TYPE; $task->type = $type;
$task->status = ScheduledTask::STATUS_SCHEDULED; $task->status = ScheduledTask::STATUS_SCHEDULED;
$task->scheduled_at = $datetime->addHour(); $task->scheduled_at = $datetime;
$task->save(); $task->save();
} }