Merge pull request #1422 from mailpoet/tasks-pausing

Pause scheduled tasks for deactivated emails [MAILPOET-1442]
This commit is contained in:
Michelle Shull
2018-07-10 09:59:03 -04:00
committed by GitHub
3 changed files with 41 additions and 31 deletions

View File

@ -325,10 +325,13 @@ class Newsletter extends Model {
$this->set('status', $status);
$this->save();
}
if(($status === self::STATUS_DRAFT) && ($this->type === self::TYPE_NOTIFICATION)) {
$types_with_activation = [self::TYPE_NOTIFICATION, self::TYPE_WELCOME, self::TYPE_AUTOMATIC];
if(($status === self::STATUS_DRAFT) && in_array($this->type, $types_with_activation)) {
ScheduledTask::pauseAllByNewsletter($this);
}
if(($status === self::STATUS_ACTIVE) && ($this->type === self::TYPE_NOTIFICATION)) {
if(($status === self::STATUS_ACTIVE) && in_array($this->type, $types_with_activation)) {
ScheduledTask::setScheduledAllByNewsletter($this);
}
return $this;