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

backend/config/params.php

@@ -2,5 +2,4 @@
 return [
     'adminEmail' => 'admin@example.com',
     'name' => 'Арт Проект',
-    'frontUrl' => 'http://task-on.com'
 ];

common/config/params.php

@@ -3,4 +3,5 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
+    'frontUrl' => 'http://task-on.com'
 ];

common/modules/school/controllers/CourseController.php

@@ -3,7 +3,6 @@
 namespace common\modules\school\controllers;
 
 use common\components\BaseController;
-
 use common\modules\school\models\Courses;
 use common\modules\school\models\SearchCourses;
 use common\modules\school\models\SearchLessons;

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

@@ -9,6 +9,8 @@ class CheckClickingOnTheLink extends ConditionBase implements ConditionInterface
 
     public $name = 'Был произведен переход по ссылке';
 
+    public $params=[];
+
     /**
      * @param null|string $conditionName
      * @return $this mixed
@@ -16,4 +18,8 @@ class CheckClickingOnTheLink extends ConditionBase implements ConditionInterface
     public static function init($conditionName=__CLASS__){
         return parent::init($conditionName);
     }
+
+    public function check(){
+        return true;
+    }
 } 
\ No newline at end of file

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

@@ -9,6 +9,8 @@ class CheckEmailToOpening extends ConditionBase implements ConditionInterface {
 
     public $name = 'Письмо было открыто';
 
+    public $params=[];
+
     /**
      * @param null|string $conditionName
      * @return $this mixed
@@ -16,4 +18,8 @@ class CheckEmailToOpening extends ConditionBase implements ConditionInterface {
     public static function init($conditionName=__CLASS__){
         return parent::init($conditionName);
     }
+
+    public function check(){
+        return true;
+    }
 }
\ No newline at end of file

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

@@ -4,4 +4,6 @@ namespace common\modules\triggers\components\conditions\vendor;
 interface ConditionInterface {
     // Функция инициализации
     public static function init($conditionName=null);
+
+    public function check();
 } 
\ No newline at end of file

console/migrations/m160204_115214_add_schedule_table.php

+<?php
+
+use yii\db\Migration;
+use \yii\db\Schema;
+
+class m160204_115214_add_schedule_table extends Migration
+{
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+        $this->createTable(
+            'trigger_schedule',
+            [
+                'id' => Schema::TYPE_PK,
+                'sended' => Schema::TYPE_BOOLEAN.' DEFAULT 0 NOT NULL',
+                'checked' => Schema::TYPE_BOOLEAN.' DEFAULT 0 NOT NULL',
+                'message' => Schema::TYPE_TEXT.' NOT NULL',
+                'email' => Schema::TYPE_STRING.' NOT NULL',
+                'time' => Schema::TYPE_DATETIME,
+                'date_create' => Schema::TYPE_DATETIME
+            ]
+        );
+    }
+
+    public function safeDown()
+    {
+        $this->dropTable(
+            'trigger_schedule'
+        );
+    }
+}