Another one admin fix

Yarik
1 parent 4e55ce81
Showing 12 changed files with 290 additions and 171 deletions Show diff stats
backend/controllers/BrandController.php
backend/controllers/CategoryController.php
backend/views/brand/_form.php
backend/views/brand/index.php
backend/views/brand/update.php
backend/views/brand/view.php
backend/views/category/index.php
backend/views/category/update.php
backend/views/category/view.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/CategorySearch.php
@@ -163,7 +163,7 @@
          */
         protected function findModel($id)
         {
-            if(( $model = Brand::findOne($id) ) !== NULL) {
+            if(( $model = Brand::find()->with('lang')->where(['brand_id' => $id])->one() ) !== NULL) {
                 return $model;
             } else {
                 throw new NotFoundHttpException('The requested page does not exist.');
@@ -54,7 +54,6 @@
         {
             $searchModel = new CategorySearch();
             $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-            
             return $this->render('index', [
                 'searchModel'  => $searchModel,
                 'dataProvider' => $dataProvider,
@@ -70,8 +69,13 @@
          */
         public function actionView($id)
         {
+            $model = $this->findModel($id);
+            $tree = $model->getParents()
+                          ->with('lang')
+                          ->all();
             return $this->render('view', [
-                'model' => $this->findModel($id),
+                'model' => $model,
+                'tree'  => $tree,
             ]);
         }
@@ -160,7 +164,11 @@
          */
         protected function findModel($id)
         {
-            if(( $model = Category::findOne($id) ) !== NULL) {
+            if(( $model = Category::find()
+                                  ->where([ 'category_id' => $id ])
+                                  ->with('lang')
+                                  ->one() ) !== NULL
+            ) {
                 return $model;
             } else {
                 throw new NotFoundHttpException('The requested page does not exist.');
@@ -43,6 +43,8 @@
                  ],
              ]); ?>
+    <?= $form->field($model, 'in_menu')->dropDownList([\Yii::t('product', 'No'), \Yii::t('product', 'Yes')]); ?>
+    
     <?= LanguageForm::widget([
         'model_langs' => $model_langs,
         'formView'    => '@backend/views/brand/_form_language',
 <?php
-
-use yii\helpers\Html;
-use yii\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel common\modules\product\models\BrandSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = Yii::t('product', 'Brands');
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use common\modules\product\models\Brand;
+    use common\modules\product\models\BrandSearch;
+    use yii\data\ActiveDataProvider;
+    use yii\helpers\Html;
+    use yii\grid\GridView;
+    use yii\web\View;
+    
+    /**
+     * @var View               $this
+     * @var BrandSearch        $searchModel
+     * @var ActiveDataProvider $dataProvider
+     */
+    
+    $this->title = Yii::t('product', 'Brands');
+    $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="brand-index">
-
+    
     <h1><?= Html::encode($this->title) ?></h1>
-
+    
     <p>
-        <?= Html::a(Yii::t('product', 'Create Brand'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('product', 'Create Brand'), [ 'create' ], [ 'class' => 'btn btn-success' ]) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+        'filterModel'  => $searchModel,
+        'columns'      => [
             'brand_id',
+            [
+                'attribute' => 'brand_name',
+                'value'     => 'lang.name',
+            ],
             'imageUrl:image',
-            ['class' => 'yii\grid\ActionColumn'],
+            [
+                'attribute' => 'in_menu',
+                'content'   => function($model) {
+                    /**
+                     * @var Brand $model
+                     */
+                    return Html::tag('span', '', [
+                        'class' => 'glyphicon glyphicon-'.($model->in_menu?'ok':'remove'),
+                    ]);
+                },
+            ],
+            [ 'class' => 'yii\grid\ActionColumn',
         ],
+    ],
     ]); ?>
 </div>
@@ -13,13 +13,13 @@
     $this->title = Yii::t('product', 'Update {modelClass}: ', [
             'modelClass' => 'Brand',
-        ]) . ' ' . $model->brand_id;
+        ]) . ' ' . $model->lang->name;
     $this->params[ 'breadcrumbs' ][] = [
         'label' => Yii::t('product', 'Brands'),
         'url'   => [ 'index' ],
     ];
     $this->params[ 'breadcrumbs' ][] = [
-        'label' => $model->brand_id,
+        'label' => $model->lang->name,
         'url'   => [
             'view',
             'id' => $model->brand_id,
 <?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model common\modules\product\models\Brand */
-
-$this->title = $model->brand_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Brands'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use common\modules\product\models\Brand;
+    use yii\helpers\Html;
+    use yii\web\View;
+    use yii\widgets\DetailView;
+    
+    /**
+     * @var View  $this
+     * @var Brand $model
+     */
+    
+    $this->title = $model->lang->name;
+    $this->params[ 'breadcrumbs' ][] = [
+        'label' => Yii::t('product', 'Brands'),
+        'url'   => [ 'index' ],
+    ];
+    $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="brand-view">
-
+    
     <h1><?= Html::encode($this->title) ?></h1>
-
+    
     <p>
-        <?= Html::a(Yii::t('product', 'Update'), ['update', 'id' => $model->brand_id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('product', 'Delete'), ['delete', 'id' => $model->brand_id], [
+        <?= Html::a(Yii::t('product', 'Update'), [
+            'update',
+            'id' => $model->brand_id,
+        ], [ 'class' => 'btn btn-primary' ]) ?>
+        <?= Html::a(Yii::t('product', 'Delete'), [
+            'delete',
+            'id' => $model->brand_id,
+        ], [
             'class' => 'btn btn-danger',
-            'data' => [
+            'data'  => [
                 'confirm' => Yii::t('product', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
+                'method'  => 'post',
             ],
         ]) ?>
     </p>
-
+    
     <?= DetailView::widget([
-        'model' => $model,
+        'model'      => $model,
         'attributes' => [
             'brand_id',
+            'lang.name',
+            'lang.alias',
+            [
+                'attribute' => 'in_menu',
+                'value'     => Html::tag('span', '', [
+                    'class' => 'glyphicon glyphicon-' . ( $model->in_menu ? 'ok' : 'remove' ),
+                ]),
+                'format'    => 'html',
+            ],
             'imageUrl:image',
+            'lang.meta_title',
+            'lang.meta_robots',
+            'lang.meta_desc',
+            'lang.seo_text',
         ],
     ]) ?>
@@ -40,6 +40,7 @@
                     return implode('&nbsp;&rarr;&nbsp;', $op);
                 },
             ],
+            'imageUrl:image',
             [
                 'class'      => 'yii\grid\ActionColumn',
             ],
@@ -14,13 +14,13 @@
     $this->title = Yii::t('product', 'Update {modelClass}: ', [
             'modelClass' => 'Category',
-        ]) . ' ' . $model->category_id;
+        ]) . ' ' . $model->lang->name;
     $this->params[ 'breadcrumbs' ][] = [
         'label' => Yii::t('product', 'Categories'),
         'url'   => [ 'index' ],
     ];
     $this->params[ 'breadcrumbs' ][] = [
-        'label' => $model->category_id,
+        'label' => $model->lang->name,
         'url'   => [
             'view',
             'id' => $model->category_id,
 <?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model common\modules\product\models\Category */
-
-$this->title = $model->category_id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Categories'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use common\modules\product\models\Category;
+    use yii\helpers\Html;
+    use yii\web\View;
+    use yii\widgets\DetailView;
+    
+    /**
+     * @var View       $this
+     * @var Category   $model
+     * @var Category[] $tree
+     */
+    
+    $this->title = $model->lang->name;
+    $this->params[ 'breadcrumbs' ][] = [
+        'label' => Yii::t('product', 'Categories'),
+        'url'   => [ 'index' ],
+    ];
+    $this->params[ 'breadcrumbs' ][] = $this->title;
+    $tree_links = [];
+    foreach($tree as $item) {
+        $tree_links[] = Html::a($item->lang->name, [
+            'view',
+            'id' => $item->category_id,
+        ]);
+    }
+    if(empty($tree_links)) {
+        $tree_string = \Yii::t('product', 'No parent categories');
+    } else {
+        $tree_string = implode('&nbsp;&rarr;&nbsp;', $tree_links);
+    }
 ?>
 <div class="category-view">
-
+    
     <h1><?= Html::encode($this->title) ?></h1>
-
+    
     <p>
-        <?= Html::a(Yii::t('product', 'Update'), ['update', 'id' => $model->category_id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('product', 'Delete'), ['delete', 'id' => $model->category_id], [
+        <?= Html::a(Yii::t('product', 'Update'), [
+            'update',
+            'id' => $model->category_id,
+        ], [ 'class' => 'btn btn-primary' ]) ?>
+        <?= Html::a(Yii::t('product', 'Delete'), [
+            'delete',
+            'id' => $model->category_id,
+        ], [
             'class' => 'btn btn-danger',
-            'data' => [
+            'data'  => [
                 'confirm' => Yii::t('product', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
+                'method'  => 'post',
             ],
         ]) ?>
-        <?= Html::a(Yii::t('product', 'Create Category'), ['category/create'], ['class' => 'btn btn-success']) ?>
-        <?php if (!empty($model->parent_id)) :?>
-            <?= Html::a(Yii::t('product', 'Create category By {name}', ['name' => $model->parent->category_id]), ['category/create?parent='. $model->parent->category_id], ['class' => 'btn btn-success']) ?>
-        <?php endif?>
+        <?= Html::a(Yii::t('product', 'Create Category'), [ 'category/create' ], [ 'class' => 'btn btn-success' ]) ?>
+        <?php
+            if(!empty( $model->parent_id )) {
+                echo Html::a(Yii::t('product', 'Create category By {name}', [ 'name' => $model->parent->lang->name ]), [ 'category/create?parent=' . $model->parent->category_id ], [ 'class' => 'btn btn-success' ]);
+            }
+        ?>
     </p>
-
+    
     <?= DetailView::widget([
-        'model' => $model,
+        'model'      => $model,
         'attributes' => [
             'category_id',
-            'parent_id',
-            'path',
-            'depth',
+            [
+                'label'  => \Yii::t('product', 'Category tree'),
+                'value'  => $tree_string,
+                'format' => 'html',
+            ],
             'imageUrl:image',
-            'product_unit_id',
+            'lang.alias',
+            'lang.meta_title',
+            'lang.meta_robots',
+            'lang.meta_desc',
+            'lang.seo_text',
+            'lang.h1',
         ],
     ]) ?>
 <?php
-
-namespace common\modules\product\models;
-
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use yii\db\ActiveQuery;
-
-/**
- * BrandSearch represents the model behind the search form about `common\modules\product\models\Brand`.
- */
-class BrandSearch extends Brand
-{
-    public $brand_name;
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['brand_id'], 'integer'],
-        ];
-    }
-    public function behaviors()
-    {
-        return [];
-    }
+    namespace common\modules\product\models;
-    /**
-     * @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 = Brand::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;
-        }*/
-
-        $dataProvider->setSort([
-            'attributes' => [
-                'brand_name',
-            ],
-        ]);
-
-        // grid filtering conditions
-        $query->andFilterWhere([
-            'brand_id' => $this->brand_id,
-        ]);
-
-        $query->orderBy(['brand_id' => SORT_ASC]);
-
-        return $dataProvider;
-    }
+    use yii\base\Model;
+    use yii\data\ActiveDataProvider;
+    use yii\db\ActiveQuery;
     /**
-     * @param null|Category  $category
-     * @param array $params
-     * @param null|ActiveQuery  $productQuery
-     *
-     * @return ActiveQuery
+     * BrandSearch represents the model behind the search form about
+     * `common\modules\product\models\Brand`.
      */
-    public function getBrands($category = null, $params = [], $productQuery = null) {
-
-        $query = Brand::find()
-            ->select([
-                Brand::tableName() .'.*'
+    class BrandSearch extends Brand
+    {
+        
+        public $brand_name;
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'brand_name' ],
+                    'safe',
+                ],
+                [
+                    [ 'brand_id' ],
+                    'integer',
+                ],
+            ];
+        }
+        
+        public function behaviors()
+        {
+            return [];
+        }
+        
+        /**
+         * @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 = Brand::find()
+                          ->joinWith('lang');
+            
+            // 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;
+            }*/
+            
+            $dataProvider->setSort([
+                'attributes' => [
+                    'brand_id',
+                    'brand_name' => [
+                        'asc'  => [ 'brand_lang.name' => SORT_ASC ],
+                        'desc' => [ 'brand_lang.name' => SORT_DESC ],
+                    ],
+                ],
+            ]);
+            
+            // grid filtering conditions
+            $query->andFilterWhere([
+                'brand.brand_id' => $this->brand_id,
             ])
-            ->innerJoin(Product::tableName(), Product::tableName() .'.brand_id='. Brand::tableName() .'.brand_id')
-            ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id');
+                  ->andFilterWhere([
+                      'ilike',
+                      'brand_lang.name',
+                      $this->brand_name,
+                  ]);
+            
+            return $dataProvider;
+        }
-        $query->innerJoin('product_variant', 'product_variant.product_id = '. Product::tableName() .'.product_id');
-        $query->where(['!=', 'product_variant.stock', 0]);
-        $query->groupBy(Product::tableName() .'.product_id');
-        if (!empty($category)) {
-            $query->andWhere([
-                ProductCategory::tableName() .'.category_id' => $category->category_id
+        /**
+         * @param null|Category    $category
+         * @param array            $params
+         * @param null|ActiveQuery $productQuery
+         *
+         * @return ActiveQuery
+         */
+        public function getBrands($category = NULL, $params = [], $productQuery = NULL)
+        {
+            
+            $query = Brand::find()
+                          ->select([
+                              Brand::tableName() . '.*',
+                          ])
+                          ->innerJoin(Product::tableName(), Product::tableName() . '.brand_id=' . Brand::tableName() . '.brand_id')
+                          ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() . '.product_id=' . Product::tableName() . '.product_id');
+            
+            $query->innerJoin('product_variant', 'product_variant.product_id = ' . Product::tableName() . '.product_id');
+            $query->where([
+                '!=',
+                'product_variant.stock',
+                0,
             ]);
+            $query->groupBy(Product::tableName() . '.product_id');
+            if(!empty( $category )) {
+                $query->andWhere([
+                    ProductCategory::tableName() . '.category_id' => $category->category_id,
+                ]);
+            }
+            $query->groupBy(Brand::tableName() . '.brand_id');
+            
+            return $query;
         }
-        $query->groupBy(Brand::tableName() .'.brand_id');
-
-        return $query;
     }
-}
@@ -14,6 +14,9 @@
     /**
      * This is the model class for table "category".
+     *
+     * @todo Write doc for ArtboxTreeBehavior
+     *
      * @property integer           $category_id
      * @property integer           $remote_id
      * @property integer           $parent_id
@@ -64,7 +67,7 @@
                     'fields' => [
                         [
                             'name'      => 'image',
-                            'directory' => 'brand',
+                            'directory' => 'categories',
                         ],
                     ],
                 ],
@@ -2,7 +2,6 @@
     namespace common\modules\product\models;
-    use common\components\artboxtree\ArtboxTreeHelper;
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
@@ -31,7 +30,7 @@
                     'safe',
                 ],
                 [
-                    [],
+                    [ 'category_id' ],
                     'integer',
                 ],
             ];
@@ -58,11 +57,9 @@
             $query = Category::find()
                              ->joinWith('lang');
-            // add conditions that should always apply here
-            
             $dataProvider = new ActiveDataProvider([
                 'query' => $query,
-                'sort' => false,
+                'sort'  => false,
             ]);
             $this->load($params);
@@ -75,6 +72,8 @@
             // grid filtering conditions
             $query->andFilterWhere([
+                'category.category_id' => $this->category_id,
+            ])->andFilterWhere([
                 'ilike',
                 'category_lang.name',
                 $this->category_name,