- Добавлена проверка на то, срабатывал ли триггер для конкретного email. Если...

- Добавлена проверка на то, срабатывал ли триггер для конкретного email. Если нет, то триггер выполняется, иначе игнорируется
parent eb7f5f89
...@@ -234,6 +234,9 @@ class TriggerTrigger extends \common\components\ActiveRecordModel ...@@ -234,6 +234,9 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$templateData['user_fio'] = (isset($user_fio)) ? $user_fio : ''; $templateData['user_fio'] = (isset($user_fio)) ? $user_fio : '';
$sendExist = TriggerSchedule::find()->where(['trigger_id'=>$this->id, 'email'=>$email])->exists();
if (!$sendExist) {
/** @var \DateTime $time_now */ /** @var \DateTime $time_now */
$time_now=new \DateTime(); $time_now=new \DateTime();
/** @var MessageTemplate $templateModel */ /** @var MessageTemplate $templateModel */
...@@ -266,6 +269,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel ...@@ -266,6 +269,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$schedule->sended=1; $schedule->sended=1;
// $schedule->checked=(array_key_exists('checked', $params)) ? $params['checked'] : 0; // $schedule->checked=(array_key_exists('checked', $params)) ? $params['checked'] : 0;
$schedule->template_id=$this->message_template_id; $schedule->template_id=$this->message_template_id;
$schedule->trigger_id=$this->id;
$schedule->message_id=$newMessageId; $schedule->message_id=$newMessageId;
$schedule->message=$template->getTemplate(); $schedule->message=$template->getTemplate();
$schedule->email=$email; $schedule->email=$email;
...@@ -291,4 +295,5 @@ class TriggerTrigger extends \common\components\ActiveRecordModel ...@@ -291,4 +295,5 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
return $error; return $error;
} }
} }
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment