Merge branch 'master' of gitlab.artweb.com.ua:root/new_rukzachok

Karnovsky A
2 parents bace91ee c440d9a3
Showing 15 changed files with 263 additions and 179 deletions Show diff stats
backend/controllers/SiteController.php
backend/controllers/UserController.php
backend/models/User.php
backend/views/layouts/header.php
backend/views/layouts/main-sidebar.php
backend/views/user/_form.php
backend/views/user/_search.php
backend/views/user/create.php
backend/views/user/index.php
backend/views/user/update.php
backend/views/user/view.php
common/components/Mailer.php
common/models/Customer.php
common/widgets/views/registration.php
frontend/controllers/RegController.php
@@ -43,7 +43,6 @@ class SiteController extends Controller
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
-                    'logout' => ['post'],
                 ],
             ],
         ];
@@ -5,10 +5,13 @@ namespace backend\controllers;
 use Yii;
 use backend\models\User;
 use backend\models\UserSearch;
+use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use developeruz\db_rbac\behaviors\AccessBehavior;
+use yii\web\Response;
+use yii\widgets\ActiveForm;
+
 /**
  * UserController implements the CRUD actions for User model.
  */
@@ -19,32 +22,30 @@ class UserController extends Controller
      */
     public function behaviors()
     {
+
+
         return [
-            'access'=>[
-                'class' => AccessBehavior::className(),
-                'rules' =>
-                    ['site' =>
-                        [
-                            [
-                                'actions' => ['login', 'error'],
-                                'allow' => true,
-                            ]
-                        ],
-                    'user' =>
-                        [
-                            [
-                                'actions' => ['index', 'create', 'update'],
-                                'allow' => true,
-                            ]
-                        ]
-                    ],
-            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
                     'delete' => ['POST'],
                 ],
             ],
+            'access' => [
+                'class' => AccessControl::className(),
+                'rules' => [
+                    [
+                        'allow' => true,
+//                        'actions' => ['login', 'signup'],
+                        'roles' => ['admin'],
+                    ],
+                    [
+//                        'allow' => true,
+//                        'actions' => ['logout'],
+//                        'roles' => ['@'],
+                    ],
+                ],
+            ],
         ];
     }
@@ -83,8 +84,19 @@ class UserController extends Controller
     public function actionCreate()
     {
         $model = new User();
+        if (Yii::$app->request->isAjax) {
+            Yii::$app->response->format = Response::FORMAT_JSON;
+            $model->load(Yii::$app->request->post());
+            return ActiveForm::validate($model);
+        }else if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+            $model->save();
+
+            foreach($model->role as $k => $role){
+                $auth = Yii::$app->authManager;
+                $authorRole = $auth->getRole($role);
+                $auth->assign($authorRole, $model->id);
+            }
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('create', [
@@ -104,6 +116,11 @@ class UserController extends Controller
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+
+            $auth = Yii::$app->authManager;
+            $authorRole = $auth->getRole('author');
+            $auth->assign($authorRole, $model->id);
+
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
@@ -6,8 +6,11 @@ use developeruz\db_rbac\interfaces\UserRbacInterface;
 use common\models\Share;
 use common\modules\comment\models\Comment;
 use common\modules\comment\models\Rating;
+use yii\base\NotSupportedException;
 use Yii;
-
+use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveRecord;
+use yii\web\IdentityInterface;
 /**
  * This is the model class for table "user".
  *
@@ -25,8 +28,13 @@ use Yii;
  * @property Rating[] $ratings
  * @property Share[] $shares
  */
-class User extends \common\models\User implements UserRbacInterface
+class User extends ActiveRecord  implements UserRbacInterface, IdentityInterface
 {
+
+    const STATUS_DELETED = 0;
+    const STATUS_ACTIVE = 10;
+    public $password;
+
     /**
      * @inheritdoc
      */
@@ -41,16 +49,41 @@ class User extends \common\models\User implements UserRbacInterface
     public function rules()
     {
         return [
-            [['username', 'auth_key', 'password_hash', 'email'], 'required'],
+            [['username', 'password', 'email'], 'required'],
             [['status', 'created_at', 'updated_at'], 'integer'],
             [['username', 'password_hash', 'password_reset_token', 'email'], 'string', 'max' => 255],
             [['auth_key'], 'string', 'max' => 32],
-            [['email'], 'unique'],
             [['password_reset_token'], 'unique'],
-            [['username'], 'unique'],
+            ['email', 'unique', 'targetClass' => '\backend\models\User', 'message' =>  Yii::t('app','message',[
+                'field' => 'Email'
+            ])],
+        ];
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            TimestampBehavior::className(),
+            [
+                'class'              => 'common\behaviors\ShowImage',
+            ],
         ];
     }
+
+    public function beforeSave($insert)
+    {
+        $this->setPassword($this->password);
+        $this->generateAuthKey();
+        return parent::beforeSave($insert);
+    }
+
+
+
     /**
      * @inheritdoc
      */
@@ -69,6 +102,74 @@ class User extends \common\models\User implements UserRbacInterface
         ];
     }
+
+    /**
+     * Generates "remember me" authentication key
+     */
+    public function generateAuthKey()
+    {
+        $this->auth_key = Yii::$app->security->generateRandomString();
+    }
+
+    /**
+     * Generates password hash from password and sets it to the model
+     *
+     * @param string $password
+     */
+    public function setPassword($password)
+    {
+        $this->password_hash = Yii::$app->security->generatePasswordHash($password);
+    }
+
+
+
+
+
+    public function getRole(){
+        return !empty($this->id) ? \Yii::$app->authManager->getRolesByUser($this->id) : "";
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId()
+    {
+        return $this->getPrimaryKey();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAuthKey()
+    {
+        return $this->auth_key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validateAuthKey($authKey)
+    {
+        return $this->getAuthKey() === $authKey;
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentityByAccessToken($token, $type = null)
+    {
+        throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentity($id)
+    {
+        return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -93,19 +194,11 @@ class User extends \common\models\User implements UserRbacInterface
         return $this->hasMany(Share::className(), ['user_id' => 'id']);
     }
-    public function getId()
-    {
-        return $this->getPrimaryKey();
-    }
     public function getUserName()
     {
         return $this->username;
     }
-    public static function findIdentity($id)
-    {
-        return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
-    }
 }
@@ -6,9 +6,11 @@
 use yii\helpers\Html;
 use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
+use yii\helpers\Url;
 use yii\widgets\Breadcrumbs;
 use frontend\assets\AppAsset;
 use common\widgets\Alert;
+use yii\widgets\Menu;
 AppAsset::register($this);
 ?>
@@ -28,31 +30,6 @@ AppAsset::register($this);
         </a>
         <div class="navbar-custom-menu">
-            <?php
-            NavBar::begin([
-                'options' => [
-                    'class' => 'navbar-inverse navbar-fixed-top',
-                ],
-            ]);
-            if (Yii::$app->user->isGuest) {
-                $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
-                $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
-            } else {
-                $menuItems[] = '<li>'
-                    . Html::beginForm(['/site/logout'], 'post')
-                    . Html::submitButton(
-                        'Logout (' . Yii::$app->user->identity->username . ')',
-                        ['class' => 'btn btn-link']
-                    )
-                    . Html::endForm()
-                    . '</li>';
-            }
-            echo Nav::widget([
-                'options' => ['class' => 'navbar-nav navbar-right'],
-                'items' => $menuItems,
-            ]);
-            NavBar::end();
-            ?>
         </div>
     </nav>
 </header>
 \ No newline at end of file
@@ -4,70 +4,84 @@ use yii\widgets\Menu;
 <aside class="main-sidebar">
     <!-- sidebar: style can be found in sidebar.less -->
     <section class="sidebar">
-        <?=
-        Menu::widget([
-            'options' => ['class' => 'sidebar-menu'],
-            'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n",
+        <?php
+
+        $items = [
+            ['label' => 'Заказы', 'url' => ['/orders/index'], 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>'],
+            [
+                'label' => 'eCommerce',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
+                'url' => ['/product/manage'],
+                'items' => [
+                    ['label' => 'Товары', 'url' => ['/product/manage']],
+                    ['label' => 'Категории', 'url' => ['/category']],
+                    ['label' => 'Бренды', 'url' => ['/brand']],
+                    ['label' => 'Характеристики', 'url' => ['/rubrication/tax-group']],
+                    ['label' => 'Единицы измерения', 'url' => ['/product/product-unit']],
+                    ['label' => 'Статистика импорта', 'url' => ['/product/manage/import-stat']],
+                ]
+            ],
+            [
+                'label' => 'Слайдер/Банеры',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
+                'items' => [
+                    ['label' => 'Слайдер', 'url' => ['/slider/index']],
+                    ['label' => 'Банер', 'url' => ['/banner/index']],
+                ]
+            ],
+            [
+                'label' => 'Характеристики',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
+                'url' => ['/rubrication/tax-group'],
+                'items' => [
+                    ['label' => 'Характеристики', 'url' => ['/rubrication/tax-group']],
+                    ['label' => 'Зависимости', 'url' => ['/relation/manage']]
+                ]
+            ],
+            ['label' => 'Текстовые страницы', 'url' => ['/page/index']],
+            ['label' => 'Статьи', 'url' => ['/articles/index']],
+            ['label' => 'Акции', 'url' => ['/event/index']],
+            [
+                'label' => 'SEO',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
+                'items' => [
+                    ['label' => 'URL', 'url' => ['/seo/index']],
+                    ['label' => 'Шаблоны', 'url' => ['/seo-category/index']]
+                ]
+            ],
+            ['label' => 'Фон', 'url' => ['/bg/index']],
+            ['label' => 'Подписка', 'url' => ['/subscribe/index']],
+            ['label' => 'Пользователи', 'url' => ['/customer/index']],
+            ['label' => 'Группы пользователей', 'url' => ['/group/index']],
+            [
+                'label' => 'Настройка ролей',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
+                'items' => [
+                    ['label' => 'Администраторы', 'url' => ['/user/index']],
+                    ['label' => 'управление ролями', 'url' => ['/permit/access/role']],
+                    ['label' => 'управление правами доступа', 'url' => ['/permit/access/permission']]
+                ]
+            ],
-            'items' => [
-                ['label' => 'Заказы', 'url' => ['/orders/index'], 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>'],
-                [
-                    'label' => 'eCommerce',
-                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
-                    'url' => ['/product/manage'],
-                    'items' => [
-                        ['label' => 'Товары', 'url' => ['/product/manage']],
-                        ['label' => 'Категории', 'url' => ['/category']],
-                        ['label' => 'Бренды', 'url' => ['/brand']],
-                        ['label' => 'Характеристики', 'url' => ['/rubrication/tax-group']],
-                        ['label' => 'Единицы измерения', 'url' => ['/product/product-unit']],
-                        ['label' => 'Статистика импорта', 'url' => ['/product/manage/import-stat']],
-                    ]
-                ],
-                [
-                    'label' => 'Слайдер/Банеры',
-                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
-                    'items' => [
-                        ['label' => 'Слайдер', 'url' => ['/slider/index']],
-                        ['label' => 'Банер', 'url' => ['/banner/index']],
-                    ]
-                ],
-                [
-                    'label' => 'Характеристики',
-                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
-                    'url' => ['/rubrication/tax-group'],
-                    'items' => [
-                        ['label' => 'Характеристики', 'url' => ['/rubrication/tax-group']],
-                        ['label' => 'Зависимости', 'url' => ['/relation/manage']]
-                    ]
-                ],
-                ['label' => 'Текстовые страницы', 'url' => ['/page/index']],
-                ['label' => 'Статьи', 'url' => ['/articles/index']],
-                ['label' => 'Акции', 'url' => ['/event/index']],
-                [
-                    'label' => 'SEO',
-                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
-                    'items' => [
-                        ['label' => 'URL', 'url' => ['/seo/index']],
-                        ['label' => 'Шаблоны', 'url' => ['/seo-category/index']]
-                    ]
-                ],
-                ['label' => 'Фон', 'url' => ['/bg/index']],
-                ['label' => 'Подписка', 'url' => ['/subscribe/index']],
-                ['label' => 'Пользователи', 'url' => ['/customer/index']],
-                ['label' => 'Группы пользователей', 'url' => ['/group/index']],
-                [
-                    'label' => 'Настройка ролей',
-                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
-                    'items' => [
-                        ['label' => 'Администраторы', 'url' => ['/user/index']],
-                        ['label' => 'управление ролями', 'url' => ['/permit/access/role']],
-                        ['label' => 'управление правами доступа', 'url' => ['/permit/access/permission']]
-                    ]
-                ],
-            ],
+        ];
+
+
+        if (Yii::$app->user->isGuest) {
+            array_push($items,
+                ['label' => 'Signup', 'url' => ['/admin/site/signup']], ['label' => 'Login', 'url' => ['/admin/site/login']]
+            );
+        } else {
+            array_push($items,
+                ['label' => 'Logout (' . Yii::$app->user->identity->username . ')','url'=>'/admin/site/logout']
+            );
+        }
+        echo Menu::widget([
+            'options' => ['class' => 'sidebar-menu'],
+            'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n",
+
+            'items' =>$items,
         ]);
         ?>
 <?php
+use kartik\select2\Select2;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
@@ -14,19 +15,13 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'username')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'auth_key')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'password')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'password_hash')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'password_reset_token')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'status')->textInput() ?>
+    <?= $form->field($model, 'email',['enableAjaxValidation' => true])->textInput(['maxlength' => true]) ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -19,13 +19,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'username') ?>
-    <?= $form->field($model, 'auth_key') ?>
-
-    <?= $form->field($model, 'password_hash') ?>
-
-    <?= $form->field($model, 'password_reset_token') ?>
-
-    <?php // echo $form->field($model, 'email') ?>
+    <?= $form->field($model, 'email') ?>
     <?php // echo $form->field($model, 'status') ?>
@@ -34,8 +28,8 @@ use yii\widgets\ActiveForm;
     <?php // echo $form->field($model, 'updated_at') ?>
     <div class="form-group">
-        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,8 +6,8 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model backend\models\User */
-$this->title = 'Create User';
-$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
+$this->title = Yii::t('app', 'Create User');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-create">
@@ -8,7 +8,7 @@ use yii\helpers\Url;
 /* @var $searchModel backend\models\UserSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Users';
+$this->title = Yii::t('app', 'Users');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-index">
@@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create User', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('app', 'Create User'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -27,10 +27,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'username',
-            'auth_key',
-            'password_hash',
-            'password_reset_token',
-
+             'email:email',
+            // 'status',
+            // 'created_at',
+            // 'updated_at',
             ['class' => 'yii\grid\ActionColumn',
                 'template' => '{view}&nbsp;&nbsp;{update}&nbsp;&nbsp;{permit}&nbsp;&nbsp;{delete}',
@@ -5,10 +5,12 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model backend\models\User */
-$this->title = 'Update User: ' . $model->id;
-$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'User',
+]) . $model->id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update';
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
 ?>
 <div class="user-update">
@@ -7,7 +7,7 @@ use yii\widgets\DetailView;
 /* @var $model backend\models\User */
 $this->title = $model->id;
-$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-view">
@@ -15,11 +15,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a('Delete', ['delete', 'id' => $model->id], [
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
             'class' => 'btn btn-danger',
             'data' => [
-                'confirm' => 'Are you sure you want to delete this item?',
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
                 'method' => 'post',
             ],
         ]) ?>
@@ -30,11 +30,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'attributes' => [
             'id',
             'username',
-            'auth_key',
-            'password_hash',
-            'password_reset_token',
             'email:email',
             'status',
+            'created_at',
+            'updated_at',
         ],
     ]) ?>
@@ -9,6 +9,7 @@ class Mailer extends Widget{
     public $email;
     public $text;
     public $subject;
+    public $type;
     public function init(){
@@ -27,14 +28,16 @@ class Mailer extends Widget{
         $mail->Password = "k0l0b04eg";
         $mail->SetFrom('dockdep@gmail.com');
         $mail->Subject = $this->subject;
-        $mail->MsgHTML($this->text);
+        $mail->MsgHTML('test');
         $address = "dockdep@gmail.com";
         $mail->AddAddress($address);
         $mail->AddAddress($this->email);
         if(!$mail->send()) {
+
             \Yii::$app->getSession()->setFlash('error', 'Mailer Error: ' . $mail->ErrorInfo);
             return 'Mailer Error: ' . $mail->ErrorInfo;
         } else {
+
             \Yii::$app->getSession()->setFlash('success', 'Мастер-приемщик свяжется с вами в ближайшее время');
             return 'Message has been sent';
         }
@@ -74,17 +74,7 @@ class Customer extends \yii\db\ActiveRecord implements \yii\web\IdentityInterfac
 			->exists())
             $this->addError('username','Такой пользователь уже есть.');
     }
-    
-    public function sendMsg(){
-        $body = 'Вас приветствует сайт Rukzachok';
-        $body .= "\n\r";
-        $body .= 'Ваш логин: '.$this->username;
-        $body .= "\n\r";
-        $body .= 'Ваш пароль: '.$this->password;
-
-        Mailer::widget(['text'=> $body, 'subject'=> 'Спасибо за регистрацию', 'email' => $this->username ]);
-        
-    }
+
     public function afterSave($insert, $changedAttributes)
     {
@@ -98,30 +88,28 @@ class Customer extends \yii\db\ActiveRecord implements \yii\web\IdentityInterfac
         }
         $auth->assign($role, $this->id);
-        if($this->isNewRecord){
-            $this->sendMsg();
-        }
+
     }
 	public function beforeSave($insert) {
-                $this->date_time = new \yii\db\Expression('NOW()');
-                
+        $this->date_time = new \yii\db\Expression('NOW()');
+
                 /**
-		if($image = UploadedFile::getInstance($this,'image')){			
-			
+		if($image = UploadedFile::getInstance($this,'image')){
+
                         $this->deleteImage($this->old_image);
                         //$this->image = $image;
 						$this->image = time() . '_' . rand(1, 1000) . '.' . $image->extension;
                         $image->saveAs('upload/profile/'.$this->image);
-			
+
 						$resizeObj = new resize('upload/profile/'.$this->image);
 						$resizeObj -> resizeImage(240, 240, 'crop');
                         $resizeObj -> saveImage('upload/profile/ico/'.$this->image, 100);
                     }elseif(!empty($this->old_image)) $this->image = $this->old_image;
-                  **/  
-                
+                  **/
+
 		return parent::beforeSave($insert);
 	}
+<?= 'Спасибо за регистрацию'?>
 \ No newline at end of file
@@ -2,6 +2,7 @@
 namespace frontend\controllers;
+use common\components\Mailer;
 use Yii;
 use yii\web\Controller;
 use yii\filters\AccessControl;
@@ -57,6 +58,7 @@ class RegController extends Controller
 			$modelLogin->username = $model->username;
 			$modelLogin->password = $model->password;
             $modelLogin->login();
+            Mailer::widget(['type' => 'registration', 'subject'=> 'Спасибо за регистрацию', 'email' => $model->username ]);
             $this->redirect(['/iam']);
 		}