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

common/modules/triggers/models/TriggerSchedule.php

@@ -17,6 +17,7 @@ use Yii;
  * @property string $date_create
  * @property integer $list_id
  * @property integer $campaign_id
+ * @property integer $template_id
  */
 class TriggerSchedule extends \yii\db\ActiveRecord
 {

common/modules/triggers/models/TriggerTrigger.php

@@ -265,6 +265,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
                     $schedule = new TriggerSchedule();
                     $schedule->sended=1;
 //                    $schedule->checked=(array_key_exists('checked', $params)) ? $params['checked'] : 0;
+                    $schedule->template_id=$this->message_template_id;
                     $schedule->message_id=$newMessageId;
                     $schedule->message=$template->getTemplate();
                     $schedule->email=$email;