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

# Conflicts: # backend/controllers/BrandController.php # backend/views/brand/_form.php # common/modules/product/models/Brand.php # common/modules/product/widgets/views/products_block.php

Merge branch 'master' of gitlab.artweb.com.ua:root/new_rukzachok
# Conflicts: # backend/controllers/BrandController.php # backend/views/brand/_form.php # common/modules/product/models/Brand.php # common/modules/product/widgets/views/products_block.php
Karnovsky A
2 parents 060b4806 d8d0c38c
Showing 127 changed files with 907 additions and 139 deletions Show diff stats
backend/config/main.php
backend/controllers/ArticlesController.php
backend/controllers/BannerController.php
backend/controllers/BgController.php
backend/controllers/BlogController.php
backend/controllers/BrandController.php
backend/controllers/CategoryController.php
backend/controllers/CustomerController.php
backend/controllers/EventController.php
backend/controllers/OrdersController.php
backend/controllers/PageController.php
backend/controllers/SeoCategoryController.php
backend/controllers/SeoController.php
backend/controllers/SeoDynamicController.php
backend/controllers/ServiceController.php
backend/controllers/SiteController.php
backend/controllers/SliderController.php
backend/controllers/SliderImageController.php
backend/controllers/SubscribeController.php
backend/controllers/UserController.php
 <?php
+use developeruz\db_rbac\behaviors\AccessBehavior;
 $params = array_merge(
     require(__DIR__ . '/../../common/config/params.php'),
     require(__DIR__ . '/../../common/config/params-local.php'),
@@ -12,7 +13,27 @@ return [
     'layout' => 'admin',
     'controllerNamespace' => 'backend\controllers',
     'bootstrap' => ['log'],
+//    'as AccessBehavior' => [
+//        'class' => AccessBehavior::className(),
+//        'rules' =>
+//            ['permit/access' =>
+//                [
+//                    [
+//                        'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ],
+//                        'allow' => true,
+//                    ]
+//                ]
+//            ],
+//
+//    ],
     'modules' => [
+        'permit' => [
+            'class' => 'developeruz\db_rbac\Yii2DbRbac',
+            'params' => [
+                'userClass' => 'backend\models\User'
+            ]
+        ],
+
         'rubrication' => [
             'class' => 'common\modules\rubrication\Module',
             'types' => [
@@ -30,6 +51,7 @@ return [
         ]
     ],
     'components' => [
+
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
@@ -8,7 +8,7 @@ use common\models\ArticlesSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * ArticlesController implements the CRUD actions for Articles model.
  */
@@ -20,6 +20,18 @@ class ArticlesController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -9,7 +9,7 @@ use common\models\BannerSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * BannerController implements the CRUD actions for Banner model.
  */
@@ -21,6 +21,18 @@ class BannerController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\BgSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * BgController implements the CRUD actions for Bg model.
  */
@@ -20,6 +20,18 @@ class BgController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
 <?php
 namespace backend\controllers;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 use common\models\Fields;
 use Yii;
 use common\models\Blog;
@@ -22,19 +22,17 @@ class BlogController extends Controller
     public function behaviors()
     {
         return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error'],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
             ],
             'verbs' => [
                 'class' => VerbFilter::className(),
@@ -97,7 +97,6 @@ class BrandController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-        $model->setScenario('update');
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->brand_id]);
 <?php
 namespace backend\controllers;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 use common\components\artboxtree\ArtboxTreeHelper;
 use Yii;
 use common\modules\product\models\Category;
@@ -22,19 +22,17 @@ class CategoryController extends Controller
     public function behaviors()
     {
         return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error'],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
             ],
             'verbs' => [
                 'class' => VerbFilter::className(),
@@ -8,7 +8,7 @@ use common\models\CustomerSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * CustomerController implements the CRUD actions for Customer model.
  */
@@ -20,6 +20,18 @@ class CustomerController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\EventSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * EventController implements the CRUD actions for Event model.
  */
@@ -20,6 +20,18 @@ class EventController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -12,7 +12,7 @@ use backend\models\Orders;
 use backend\models\OrdersProducts;
 use common\modules\product\models\ProductVariant;
 use yii\web\NotFoundHttpException;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 class OrdersController extends Controller
 {
@@ -22,6 +22,18 @@ class OrdersController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -47,7 +59,7 @@ class OrdersController extends Controller
 		$model = $this->findModel((int)$id);
         $dataProvider = new ActiveDataProvider([
-            'query' => OrdersProducts::find()->where(['order_id'=>(int)$_GET['id']]),
+            'query' => OrdersProducts::find()->where(['order_id'=>(int)$id]),
             'pagination' => [
                 'pageSize' => 20,
             ],
@@ -8,7 +8,7 @@ use common\models\PageSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * PageController implements the CRUD actions for Page model.
  */
@@ -20,6 +20,18 @@ class PageController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\SeoCategorySearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * SeoCategoryController implements the CRUD actions for SeoCategory model.
  */
@@ -20,6 +20,18 @@ class SeoCategoryController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\SeoSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * SeoController implements the CRUD actions for Seo model.
  */
@@ -20,6 +20,18 @@ class SeoController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\SeoDynamicSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * SeoDynamicController implements the CRUD actions for SeoDynamic model.
  */
@@ -20,6 +20,18 @@ class SeoDynamicController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\ServiceSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * ServiceController implements the CRUD actions for Service model.
  */
@@ -20,6 +20,18 @@ class ServiceController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
 <?php
 namespace backend\controllers;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 use common\modules\product\models\Brand;
 use common\modules\product\models\BrandName;
 use common\modules\product\models\Category;
@@ -27,19 +27,17 @@ class SiteController extends Controller
     public function behaviors()
     {
         return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error', 'go'],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
             ],
             'verbs' => [
                 'class' => VerbFilter::className(),
@@ -10,7 +10,7 @@ use yii\helpers\ArrayHelper;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * SliderController implements the CRUD actions for Slider model.
  */
@@ -22,6 +22,18 @@ class SliderController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
 <?php
 namespace backend\controllers;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 use common\models\Slider;
 use Yii;
 use common\models\SliderImage;
@@ -21,6 +21,18 @@ class SliderImageController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
@@ -8,7 +8,7 @@ use common\models\SubscribeSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-
+use developeruz\db_rbac\behaviors\AccessBehavior;
 /**
  * SubscribeController implements the CRUD actions for Subscribe model.
  */
@@ -20,6 +20,18 @@ class SubscribeController extends Controller
     public function behaviors()
     {
         return [
+            'access'=>[
+                'class' => AccessBehavior::className(),
+                'rules' =>
+                    ['site' =>
+                        [
+                            [
+                                'actions' => ['login', 'error'],
+                                'allow' => true,
+                            ]
+                        ]
+                    ]
+            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use backend\models\User;
+use backend\models\UserSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use developeruz\db_rbac\behaviors\AccessBehavior;
+/**
+ * UserController implements the CRUD actions for User model.
+ */
+class UserController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    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'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all User models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new UserSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single User model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new User model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new User();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing User model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing User model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the User model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return User the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = User::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
+<?php
+
+namespace backend\models;
+
+use developeruz\db_rbac\interfaces\UserRbacInterface;
+use common\models\Share;
+use common\modules\comment\models\Comment;
+use common\modules\comment\models\Rating;
+use Yii;
+
+/**
+ * This is the model class for table "user".
+ *
+ * @property integer $id
+ * @property string $username
+ * @property string $auth_key
+ * @property string $password_hash
+ * @property string $password_reset_token
+ * @property string $email
+ * @property integer $status
+ * @property integer $created_at
+ * @property integer $updated_at
+ *
+ * @property Comment[] $comments
+ * @property Rating[] $ratings
+ * @property Share[] $shares
+ */
+class User extends \common\models\User implements UserRbacInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'user';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['username', 'auth_key', 'password_hash', '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'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'username' => 'Username',
+            'auth_key' => 'Auth Key',
+            'password_hash' => 'Password Hash',
+            'password_reset_token' => 'Password Reset Token',
+            'email' => 'Email',
+            'status' => 'Status',
+            'created_at' => 'Created At',
+            'updated_at' => 'Updated At',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getComments()
+    {
+        return $this->hasMany(Comment::className(), ['user_id' => 'id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getRatings()
+    {
+        return $this->hasMany(Rating::className(), ['user_id' => 'id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getShares()
+    {
+        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]);
+    }
+
+}
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\models\User;
+
+/**
+ * UserSearch represents the model behind the search form about `backend\models\User`.
+ */
+class UserSearch extends User
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'status', 'created_at', 'updated_at'], 'integer'],
+            [['username', 'auth_key', 'password_hash', 'password_reset_token', 'email'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = User::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'id' => $this->id,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'username', $this->username])
+            ->andFilterWhere(['like', 'auth_key', $this->auth_key])
+            ->andFilterWhere(['like', 'password_hash', $this->password_hash])
+            ->andFilterWhere(['like', 'password_reset_token', $this->password_reset_token])
+            ->andFilterWhere(['like', 'email', $this->email]);
+
+        return $dataProvider;
+    }
+}
@@ -18,8 +18,6 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
-    <?php /*= \common\components\artboximage\ArtboxImageHelper::fileinputWidget($model, 'imageUrl');*/?>
-
     <?= $form->field($model, 'image')->fileInput(['accept' => 'image/*']) ?>
     <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
@@ -56,6 +56,16 @@ use yii\widgets\Menu;
                 ['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']]
+                    ]
+                ],
+
             ],
@@ -11,37 +11,24 @@ $this-&gt;title = &#39;Заказы&#39;;
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1>Заказы</h1>
+<?php \yii\widgets\Pjax::begin(   [
-	<?php $form = ActiveForm::begin(['id' => 'label-form','method'=>'get','action'=>['/admin/orders/index']]); ?>
-
-
-    <?php ActiveForm::end(); ?>
-
+]); ?>
 <?= GridView::widget([
     'dataProvider' => $dataProvider,
     'filterModel' => $searchModel,
     'columns' => [
-       // ['class' => 'yii\grid\SerialColumn'],
 		[
                 'attribute' => 'id',
                 'format' => 'raw',
                 'options' => ['class' => 'btn btn-warning'],
                 'value' => function($model){
-                    return Html::button($model->id, ['id'=>$model->id, 'class' => 'btn btn-warning']); '/admin/orders/show?id=47';
-                 //return Html::a($model->id, ['/admin/orders/show', 'id'=>$model->id], ['class'=>'btn btn-warning'] );
-                // return Html::a($data->name, ['/admin/orders/show','id'=>$data->id]);
+                    return Html::button($model->id, ['id'=>$model->id, 'class' => 'btn btn-warning']);
+
                 }
             ],
-		/*[
-		'attribute' =>'username',
-		'value'=>function($data){
-                            if(!empty($data->user->username))return Html::a($data->user->username, ['/admin/users/show','id'=>$data->user->id]);
-                        },
-                'format'=>'raw',                
-		//'contentOptions'=>['style'=>'width: 160px;']
-		], */       
 		[
 		'attribute' => 'date_time',
 		'value'=>'date_time',
@@ -55,18 +42,15 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 		[
 		'attribute' => 'phone',
 		'value'=>'phone',
-		//'contentOptions'=>['style'=>'max-width: 300px;']
 		],
 		[
 		'attribute' => 'total',
 		'value'=>'total',
-		//'contentOptions'=>['style'=>'max-width: 300px;']
 		],
 		[
 			'filter'    => yii\helpers\ArrayHelper::map(Label::find()->orderBy('id')->asArray()->all(), 'id', 'label'),
 			'attribute' => 'label',
 			'value' => function ($model, $key, $index, $column) {
-					//  var_dump($model); var_dump($key); exit;
 					return Html::activeDropDownList($model, 'label',
 						yii\helpers\ArrayHelper::map(Label::find()->orderBy('id')->asArray()->all(), 'id', 'label'),
 						[
@@ -84,11 +68,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 		],
         [
             'attribute' => 'pay',
-            'value' => function ($model, $key, $index, $column) {
-                //  var_dump($model); var_dump($key); exit;
+			'filter'    => [
+				0 => 'Нет',1=>'Да'
+			],
+			'value' => function ($model, $key, $index, $column) {
                 return Html::activeDropDownList($model, 'pay',[0 => 'Нет',1=>'Да'],
                     [
-                       // 'prompt' => 'Нет',
                         'onchange' => "$.ajax({
                                      url: \"/admin/orders/payupdate\",
                                      type: \"post\",
@@ -112,3 +97,4 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         ],		
     ],
 ]) ?>
+<?php \yii\widgets\Pjax::end(); ?>
 \ No newline at end of file
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\User */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="user-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'username')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'auth_key')->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() ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\UserSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="user-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $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') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?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']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+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->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\helpers\Url;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\UserSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Users';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a('Create User', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id',
+            'username',
+            'auth_key',
+            'password_hash',
+            'password_reset_token',
+
+
+            ['class' => 'yii\grid\ActionColumn',
+                'template' => '{view}&nbsp;&nbsp;{update}&nbsp;&nbsp;{permit}&nbsp;&nbsp;{delete}',
+                'buttons' =>
+                    [
+                        'permit' => function ($url, $model) {
+                            return Html::a('<span class="glyphicon glyphicon-wrench"></span>', Url::to(['/permit/user/view', 'id' => $model->id]), [
+                                'title' => Yii::t('yii', 'Change user role')
+                            ]); },
+                    ]
+            ],
+        ],
+    ]); ?>
+</div>
+<?php
+
+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->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update';
+?>
+<div class="user-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\User */
+
+$this->title = $model->id;
+$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-view">
+
+    <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], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => 'Are you sure you want to delete this item?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id',
+            'username',
+            'auth_key',
+            'password_hash',
+            'password_reset_token',
+            'email:email',
+            'status',
+        ],
+    ]) ?>
+
+</div>
@@ -2,14 +2,9 @@ $(document).ready(function(){
 	var iii = true;
-	// console.log(ddd);
-	// if (ddd) {console.log('hello var ddd is correnct')
-	// }else {
-	// 	console.log('var ddd is not exist');
-	// };
-
-	console.log($('button'));
-	$('button').click(function(){
+
+
+	$('body').on('click','.btn-warning', function(){
 		var testt = $(this);
@@ -28,7 +28,7 @@ class ArtboxImage extends Component {
         'bmp' => 'bmp',
     ];
-    public $uploadUrl = '@web/artboxfile/action/upload';
+    public $uploadUrl = '/admin/artboxfile/action/upload';
     public function load($file = null, $driver = null) {
         if(empty($file) || !realpath($file)) {
@@ -37,8 +37,7 @@ class ArtboxImage extends Component {
         return Image::factory($file, $driver ? $driver : $this->driver);
     }
-    public function fileinputWidget($model, $modelField = 'file', $formField = 'fileUpload', $multiple = false, $imageOnly = true) {
-        $uploadUrl = Yii::getAlias($this->uploadUrl);
+    public function fileinputWidget($model, $modelField, $formField = 'fileUpload', $multiple = false, $imageOnly = true) {
         $options = [
             'multiple' => $multiple,
         ];
@@ -55,7 +54,7 @@ class ArtboxImage extends Component {
                 'overwriteInitial' => !$multiple,
                 'showRemove' => true,
                 'showUpload' => false,
-                'uploadUrl' => $uploadUrl,
+                'uploadUrl' => $this->uploadUrl,
                 'uploadExtraData' => [
                     'fileField' => $modelField,
                     'multiple' => intval($multiple),
@@ -130,11 +130,8 @@ return [
     ],
     'modules' => [
-//        'file' => [
-//            'class' => 'common\modules\file\Module',
-//        ],
-        'artboxfile' => [
-            'class' => 'common\modules\artboxfile\Module',
+        'file' => [
+            'class' => 'common\modules\file\Module',
         ],
         'relation' => [
             'class' => 'common\modules\relation\Module',
@@ -185,4 +185,6 @@ class User extends ActiveRecord implements IdentityInterface
     {
         $this->password_reset_token = null;
     }
+
+
 }
@@ -27,6 +27,7 @@ use Yii;
  */
 class Brand extends \yii\db\ActiveRecord
 {
+    public $imageUpload;
     public function behaviors()
     {
@@ -80,7 +81,8 @@ class Brand extends \yii\db\ActiveRecord
             [['alias', 'name'], 'string', 'max' => 250],
             [['image', 'meta_title'], 'string', 'max' => 255],
             [['meta_robots'], 'string', 'max' => 50],
-            ['image', 'file', 'extensions' => 'jpg, gif, png', 'on' => ['insert', 'update']],
+            [['imageUpload'], 'safe'],
+            [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
 //            [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']],
         ];
     }
-<div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
+<div class="products">
     <h3><?= $title?></h3>
     <ul>
         <?php foreach($products as $product) :?>
+<?php
+
+namespace console\controllers;
+
+use Yii;
+use yii\console\Controller;
+
+class RbacController extends Controller
+{
+    public function actionInit()
+    {
+        $auth = Yii::$app->authManager;
+
+        // add "createPost" permission
+        $createPost = $auth->createPermission('createPost');
+        $createPost->description = 'Create a post';
+        $auth->add($createPost);
+
+        // add "updatePost" permission
+        $updatePost = $auth->createPermission('updatePost');
+        $updatePost->description = 'Update post';
+        $auth->add($updatePost);
+
+//        // add "author" role and give this role the "createPost" permission
+        $author = $auth->createRole('author');
+        $auth->add($author);
+        $auth->addChild($author, $createPost);
+//
+//        // add "admin" role and give this role the "updatePost" permission
+//        // as well as the permissions of the "author" role
+        $admin = $auth->createRole('admin');
+        $auth->add($admin);
+        $auth->addChild($admin, $updatePost);
+        $auth->addChild($admin, $author);
+//
+//        // Assign roles to users. 1 and 2 are IDs returned by IdentityInterface::getId()
+//        // usually implemented in your User model.
+//        $auth->assign($author, 2);
+//        $auth->assign($admin, 1);
+
+
+    }
+}
+
+
+
@@ -38,7 +38,7 @@ class BasketController extends Controller
                 }
                 $body .= "\n\r";
-                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save() && $modelOrder->contact('borisenko.pavel@gmail.com',$body)) {
+                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) {
                         foreach ($_POST['ProductVariant'] as $index=>$row) {
                           $modelOrdersProducts = new OrdersProducts();
                             $mod_id = $row['id'];
@@ -5,23 +5,17 @@ use yii\helpers\Url;
 <li class="item">
     <div class="boxitem">
         <div class="pixbox">
-            <a href="<?= Url::to(['catalog/product', 'product' => $product])?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
+            <a href="<?= Url::to([
+                'catalog/product',
+                'product' => $product])
+            ?>">
+                <?php if (empty($product->image)) :?>
+                    <img src="/img/no_photo.png">
+                <?php else :?>
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->image->imageUrl, 'list')?>
+                <?php endif?>
             </a>
         </div>
-        <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
-        <ul class="product-special">
-            <?php if(!empty($product->is_top)) :?>
-                <li class="top">top&nbsp;</li>
-            <?php endif?>
-            <?php if(!empty($product->is_new)) :?>
-                <li class="new">new&nbsp;</li>
-            <?php endif?>
-            <?php if(!empty($product->akciya)) :?>
-                <li class="promo">promo&nbsp;</li>
-            <?php endif?>
-        </ul>
-        <?php endif?>
         <a href="<?= Url::to([
             'catalog/product',
             'product' => $product])
@@ -52,11 +46,16 @@ use yii\helpers\Url;
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
             <?php foreach ($product->variants as $variant) : ?>
+                <?php if (!empty($variant->image)) :?>
                 <li>
-                    <a href="<?= Url::to(['catalog/product', 'product' => $product, '#' => 'm' . $variant->product_variant_id]) ?>">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+                    <a href="<?= Url::to([
+                        'catalog/product',
+                        'product' => $product,
+                        '#' => 'm' . $variant->product_variant_id]) ?>">
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->image->imageUrl, 'product_variant')?>
                     </a>
                 </li>
+                <?php endif; ?>
             <?php endforeach; ?>
         </ul>
     </div>
@@ -16,17 +16,17 @@ $this-&gt;registerJsFile (
 <?php
-echo '<div class="home_banner_up">';
-    echo SliderWidget::widget(["title"=>"HOME_SLIDER"]);
-    echo BannerWidget::widget(['title' => 'HOME_RIGHT']);
+echo SliderWidget::widget(["title"=>"HOME_SLIDER"]);
-    echo '<div id="HOME_UNDER_SLIDER">';
-        echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_1']);
-        echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_2']);
-        echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_3']);
-    echo '</div>';
+echo BannerWidget::widget(['title' => 'HOME_RIGHT']);
-echo '</div>'
+echo '<div id="HOME_UNDER_SLIDER">';
+
+echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_1']);
+echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_2']);
+echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_3']);
+
+echo '</div>';
 ?>
 <?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [117,118,119,120,121]])?>
@@ -91,7 +91,7 @@ a.myorders{color:#f75d50}
 .sub{margin:2px 0px 0px 0px;}
 .sub img{float:left;margin-right:2px;}
-.rubrics{margin:60px 0 0 0;padding-bottom:10px;}
+.rubrics{margin:60px 0 0 0;padding-bottom:27px;}
 .rubrics ul{list-style:none;margin:0px;padding:0px;}
 .rubrics ul li{float:left;margin:0px 35px;}
 .rubrics ul li a{float:left;width:120px;padding-top:130px;text-align:center;text-transform: uppercase;color:#494949;text-decoration:none;font-weight:bold;}
@@ -102,7 +102,10 @@ a.myorders{color:#f75d50}
 .rubrics ul li.item_koshelki a{background:url('../img/ico5.png') no-repeat;}
-.products{border-top:1px solid #d2d2d2;padding-bottom:30px;padding-top:20px;}
+.products{padding-bottom:30px;padding-top:20px;}
+.why_me_, .products {
+    border-top: 1px solid #d2d2d2;
+}
 .products ul{list-style:none;margin:0px;padding:0px;}
 .products ul li.item{float:left;width:160px;margin:0px 35px 15px;text-align:center;position:relative;}
 .products ul li a.name{display:block;color:#494949;text-decoration:none;margin:15px 0px;height:30px;text-transform: uppercase;}
@@ -125,14 +128,14 @@ h2.why{width:213px;height:49px;background:url(&#39;../img/logo-why.png&#39;) no-repeat;m
 h2.why span{display:none;}
 ul.why_list{list-style:none;margin:0px;padding:0px;}
-ul.why_list li{float:left;width:180px;margin-right:30px;}
+ul.why_list li{float:left;margin-left:58px; width: 288px; height:96px;box-sizing: border-box;padding-left: 110px;}
 ul.why_list li span{font-weight:bold;color:#799920;}
-ul.why_list li.item1{background:url('../img/why_item1.png') left no-repeat;padding:36px 0px 20px 110px;}
-ul.why_list li.item2{background:url('../img/why_item2.png') left no-repeat;padding:20px 0px 20px 110px;}
-ul.why_list li.item3{background:url('../img/why_item3.png') left no-repeat;padding:40px 0px 40px 110px;}
-ul.why_list li.item4{background:url('../img/why_item4.png') left no-repeat;padding:20px 0px 20px 110px;}
-ul.why_list li.item5{background:url('../img/why_item5.png') left no-repeat;padding:30px 0px 30px 110px;}
-ul.why_list li.item6{background:url('../img/why_item6.png') left no-repeat;padding:40px 0px 40px 110px;}
+ul.why_list li.item1{background:url('../img/why_item1.png') left no-repeat;}
+ul.why_list li.item2{background:url('../img/why_item2.png') left no-repeat;}
+ul.why_list li.item3{background:url('../img/why_item3.png') left no-repeat;}
+ul.why_list li.item4{background:url('../img/why_item4.png') left no-repeat;}
+ul.why_list li.item5{background:url('../img/why_item5.png') left no-repeat;}
+ul.why_list li.item6{background:url('../img/why_item6.png') left no-repeat;}
 .banner_akciya{margin:50px 0px;}
@@ -858,4 +861,15 @@ a.active{font-weight:bold;text-decoration: underline;}
 #HOME_SLIDER .jssorb03 div.av:hover, #HOME_SLIDER .jssorb03 div.av:active {
     cursor: default;
     background: none;
-}
 \ No newline at end of file
+}
+.special-products {
+    padding-top: 30px;
+}
+.special-products .link_buy {
+    margin-bottom: 0;
+}
+.special-products .item {
+    margin-bottom: 0 !important;
+}
+.why_me_ {padding-top: 30px; overflow: hidden;}
+.why_me_ .why_list {width: 1038px; margin-left: -58px}
 \ No newline at end of file