Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/modules/triggers/components/conditions/Conditions.php

@@ -161,6 +161,9 @@ class Conditions {
         // Привели массив в понятный вид
         $conditionsArray=[];
         foreach($conditions as $i=>$condition) {
+            $object=Conditions::init()->getConditionById($condition->condition_id);
+            if ($object->recall===false)
+                return false;
             $conditionsArray[$i][] = $condition;
         } // На выходе получаем массив необходимого формата
         // Обрабатываем отформатированный массив

common/modules/triggers/components/conditions/conditions/CheckUserToRegistration.php

@@ -9,6 +9,8 @@ use common\modules\triggers\components\conditions\vendor\ConditionInterface;
 class CheckUserToRegistration extends ConditionBase implements ConditionInterface{
     const CONDITION_ID = 6;
 
+    public $recall=false;
+
     public $name = 'Пользователь зарегистрировался';
 
     /**

common/modules/triggers/components/conditions/vendor/ConditionBase.php

@@ -7,6 +7,8 @@ use yii\helpers\Html;
 class ConditionBase {
     protected static $conditionClass;
 
+    public $recall = true;
+
     public $name;
 
     public $config = [];

common/modules/triggers/models/TriggerTrigger.php

@@ -214,18 +214,26 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
      * @return string
      */
     public function initAction($params=array()){
-        $email = (!Yii::$app->user->isGuest) ? Yii::$app->user->identity->email : null;
-        if ($email===null && array_key_exists('email', $params))
+        $templateData = [];
+
+        if (array_key_exists('email', $params))
             $email = $params['email'];
-        else
+        elseif(empty($email) && !Yii::$app->user->isGuest) {
+            $email = Yii::$app->user->identity->email;
+        } else {
             return 'Email not found';
+        }
+
+        $user = User::findOne(['email' => $email]);
+
+        $templateData['user_fio'] = (!is_null($user)) ? $user->fio : '';
 
         /** @var \DateTime $time_now */
         $time_now=new \DateTime();
         /** @var MessageTemplate $templateModel */
         $templateModel = MessageTemplate::findOne($this->message_template_id);
         /** @var Templates $template */
-        $template = new Templates($this->message_template_id);
+        $template = new Templates($this->message_template_id, $templateData);
         $sender = new UnisenderAPI();
         // Create the send list
         $newList = $sender->createList();

common/modules/triggers/views/trigger-admin/testing.php

@@ -2,10 +2,13 @@
 use \common\components\UnisenderAPI;
 use \yii\helpers\Json;
 
-$email = 'bystrov@kupitsite.ru';
+$template = new \common\modules\messageTemplate\components\Templates(3, ['user_fio' => 'qwerty']);
+var_dump($template->getTemplate());
 
-$sender = new UnisenderAPI();
-$sender->validateSender('subscribe@task-on.com');
+//$email = 'bystrov@kupitsite.ru';
+
+//$sender = new UnisenderAPI();
+//$sender->validateSender('subscribe@task-on.com');
 // Create the send list
 //$newList = $sender->createList();
 //$newListObject=Json::decode($newList);