From 30ea8a3591d8b8666869c49a414e873aa23d640d Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Tue, 5 Jul 2016 12:39:09 +0300
Subject: [PATCH] 29.06.16

---
 backend/config/main.php                                       |  7 +++++++
 backend/views/layouts/main-sidebar.php                        | 20 +++++++++++++-------
 common/config/main.php                                        |  4 ++--
 common/modules/product/controllers/VariantController.php      | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 common/modules/product/models/Category.php                    |  9 +++++++++
 common/modules/product/models/ProductImage.php                |  4 ++--
 common/modules/product/models/ProductVariantListSearch.php    | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/views/variant/_form.php                | 79 +++++++++++++++----------------------------------------------------------------
 common/modules/product/views/variant/index.php                | 39 +++++++++++++++++++++++++++++++++++++--
 common/modules/product/views/variant/update.php               |  4 ++--
 common/modules/rubrication/controllers/TaxGroupController.php | 28 +++++++++++++++++-----------
 common/modules/rubrication/models/TaxGroup.php                |  3 ++-
 common/modules/rubrication/models/TaxOption.php               |  2 +-
 common/modules/rubrication/views/tax-group/index.php          | 11 +++++++----
 console/migrations/m160414_214746_add_level_to_tax_group.php  | 26 ++++++++++++++++++++++++++
 15 files changed, 284 insertions(+), 111 deletions(-)
 create mode 100644 common/modules/product/models/ProductVariantListSearch.php
 create mode 100755 console/migrations/m160414_214746_add_level_to_tax_group.php

diff --git a/backend/config/main.php b/backend/config/main.php
index 31ce283..96e724e 100755
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -152,6 +152,13 @@ return [
             'rules' => [
                 'slider-image/<action>/<slider_id:[A-Za-z0-9_-]+>/<id:[A-Za-z0-9_-]+>' => 'slider-image/<action>',
                 'slider-image/<action>/<slider_id:[A-Za-z0-9_-]+>' => 'slider-image/<action>',
+                'rubrication/tax-group/<level:[0-9]+>' => 'rubrication/tax-group',
+                'rubrication/tax-group/<action>/<level:[0-9]+>/<id:[A-Za-z0-9_-]+>' => 'rubrication/tax-group/<action>',
+                'rubrication/tax-group/<action>/<level:[0-9]+>' => 'rubrication/tax-group/<action>',
+                'product/manage/<action>' => 'product/manage/<action>',
+                'product/<controller>/<action>/<product_id:[A-Za-z0-9_-]+>/' => 'product/<controller>/<action>',
+                'product/<controller>/<action>/<product_id:[A-Za-z0-9_-]+>/<id:[A-Za-z0-9_-]+>' => 'product/<controller>/<action>',
+                'product/<action>/<product_id:[A-Za-z0-9_-]+>' => 'product/<action>',
                 'seo-dynamic/<action>/<seo_category_id:[A-Za-z0-9_-]+>/<id:[A-Za-z0-9_-]+>' => 'seo-dynamic/<action>',
                 'seo-dynamic/<action>/<seo_category_id:[A-Za-z0-9_-]+>' => 'seo-dynamic/<action>',
 
diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php
index f098328..8c5449e 100755
--- a/backend/views/layouts/main-sidebar.php
+++ b/backend/views/layouts/main-sidebar.php
@@ -1,4 +1,5 @@
 <?php
+use yii\helpers\Url;
 use yii\widgets\Menu;
 ?>
 <aside class="main-sidebar">
@@ -33,11 +34,11 @@ use yii\widgets\Menu;
                         'url' => ['/product/manage'],
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide']
                     ],
-                    [
-                        'label' => 'Модификации',
-                        'url' => ['/product/variant'],
-                        'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide']
-                    ],
+//                    [
+//                        'label' => 'Модификации',
+//                        'url' => ['/product/variant'],
+//                        'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide']
+//                    ],
                     [
                         'label' => 'Категории',
                         'url' => ['/category'],
@@ -65,8 +66,13 @@ use yii\widgets\Menu;
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
                     ],
                     [
-                        'label' => 'Характеристики',
-                        'url' => ['/rubrication/tax-group'],
+                        'label' => 'Характеристики Товаров',
+                        'url' => Url::toRoute(['/rubrication/tax-group', 'level'=> '0']),
+                        'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
+                    ],
+                    [
+                        'label' => 'Характеристики Модификаций',
+                        'url' => Url::toRoute(['/rubrication/tax-group', 'level'=> '1']),
                         'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
                     ],
                     [
diff --git a/common/config/main.php b/common/config/main.php
index 080f92a..9c93fe5 100755
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -43,8 +43,8 @@ return [
         'artboximage' => [
             'class' => 'common\components\artboximage\ArtboxImage',
             'driver' => 'GD',  //GD or Imagick
-            'rootPath' => Yii::getAlias('@frontend/web/images'),
-            'rootUrl' => Yii::getAlias('/images'),
+            'rootPath' => Yii::getAlias('@storage'),
+            'rootUrl' => Yii::getAlias('/storage'),
             'presets' => [
                 'product' => [
                     'resize' => [
diff --git a/common/modules/product/controllers/VariantController.php b/common/modules/product/controllers/VariantController.php
index 2d895ac..3bd3673 100644
--- a/common/modules/product/controllers/VariantController.php
+++ b/common/modules/product/controllers/VariantController.php
@@ -3,8 +3,9 @@
 namespace common\modules\product\controllers;
 
 use common\modules\product\models\Product;
+use common\modules\product\models\ProductImage;
 use common\modules\product\models\ProductVariant;
-use common\modules\product\models\ProductVariantSearch;
+use common\modules\product\models\ProductVariantListSearch;
 use Yii;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
@@ -35,10 +36,10 @@ class VariantController extends Controller
      * Lists all ProductVariant models.
      * @return mixed
      */
-    public function actionIndex()
+    public function actionIndex($product_id)
     {
-        $searchModel = new ProductVariantSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $searchModel = new ProductVariantListSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams,$product_id);
 
         if ( ($product = Yii::$app->request->get('product_id')) !== null) {
             $product = Product::findOne($product);
@@ -48,6 +49,7 @@ class VariantController extends Controller
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
             'product' => $product,
+            'product_id' => $product_id,
         ]);
     }
 
@@ -68,14 +70,17 @@ class VariantController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionCreate()
+    public function actionCreate($product_id)
     {
         $model = new ProductVariant();
-
+        $model->product_id = $product_id;
         if ($model->load(Yii::$app->request->post())) {
+
             $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
+            $model->validate();
+
+            if ($model->save()) {
 
-            if ($model->save() && $model->imagesUpload) {
                 if ( ($images = $model->imagesUpload()) !== FALSE) {
                     foreach ($images as $image) {
                         $imageModel = new ProductImage();
@@ -86,7 +91,7 @@ class VariantController extends Controller
                     }
                 }
 
-                return $this->redirect(['view', 'id' => $model->product_variant_id]);
+                return $this->redirect(['index', 'product_id' => $product_id]);
             }
         } else {
             return $this->render('create', [
@@ -98,29 +103,71 @@ class VariantController extends Controller
     /**
      * Updates an existing ProductVariant model.
      * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $product_id
      * @param integer $id
      * @return mixed
      */
-    public function actionUpdate($id)
+    public function actionUpdate($product_id, $id)
     {
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
-            $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
+
+
+
+
+
+
+
             if ($model->save()) {
-                if ( ($images = $model->imagesUpload()) !== FALSE) {
-                    foreach ($images as $image) {
+
+                if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
+                    $imageModel = ProductImage::find()->where(['product_variant_id' => $model->product_variant_id])->one();
+
+                    if($imageModel instanceof ProductImage) {
+                        $imageModel->product_id = $model->product_id;
+                        $imageModel->product_variant_id = $model->product_variant_id;
+                        $imageModel->image = $image->name;
+                        $imageModel->save();
+                    } else {
                         $imageModel = new ProductImage();
                         $imageModel->product_id = $model->product_id;
                         $imageModel->product_variant_id = $model->product_variant_id;
-                        $imageModel->image = $image;
+                        $imageModel->image = $image->name;
                         $imageModel->save();
                     }
+
+
+                    $imgDir = Yii::getAlias('@storage/products/');
+
+                    if(!is_dir($imgDir)) {
+                        mkdir($imgDir, 0755, true);
+                    }
+
+                    $image->saveAs(Yii::getAlias('@storage/products/' . $image->name));
                 }
 
-                return $this->redirect(['view', 'id' => $model->product_variant_id]);
             }
+            return $this->redirect(['index', 'product_id'=>$product_id]);
+
+
+
+
+//            $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
+//            if ($model->save()) {
+//                if ( ($images = $model->imagesUpload()) !== FALSE) {
+//                    foreach ($images as $image) {
+//                        $imageModel = new ProductImage();
+//                        $imageModel->product_id = $model->product_id;
+//                        $imageModel->product_variant_id = $model->product_variant_id;
+//                        $imageModel->image = $image;
+//                        $imageModel->save();
+//                    }
+//                }
+//
+//                return $this->redirect(['index', 'product_id' => $product_id]);
+//            }
         } else {
-            $groups = $model->category->getTaxGroups();
+            $groups = $model->category-> getTaxGroupsByLevel(1);
 
             return $this->render('update', [
                 'model' => $model,
diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php
index 062accf..880f5cd 100755
--- a/common/modules/product/models/Category.php
+++ b/common/modules/product/models/Category.php
@@ -7,6 +7,7 @@ use common\components\artboxtree\ArtboxTreeBehavior;
 use common\components\artboxtree\ArtboxTreeHelper;
 use common\modules\relation\relationBehavior;
 use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
+use common\modules\rubrication\models\TaxGroup;
 use Yii;
 use yii\base\ErrorException;
 
@@ -164,6 +165,14 @@ class Category extends \yii\db\ActiveRecord
         return $this->getRelations('tax_group_to_category');
     }
 
+//    public function getTaxGroupsByLevel($level)
+//    {
+//        return $this->hasMany(Specialization::className(), [ 'specialization_id' => 'specialization_id' ])
+//            ->viaTable('portfolio_specialization', [ 'portfolio_id' => 'portfolio_id' ]);
+//
+//        return $this->hasMany(ProductCategory::className(), ['category_id' => 'category_id'])->with(TaxGroup::tableName())->where(['level' => $level]);
+//    }
+
     public function getRemote_category()
     {
         return ArtboxTreeHelper::getArrayField($this->remote_id);
diff --git a/common/modules/product/models/ProductImage.php b/common/modules/product/models/ProductImage.php
index 865be00..617ee8c 100755
--- a/common/modules/product/models/ProductImage.php
+++ b/common/modules/product/models/ProductImage.php
@@ -97,7 +97,7 @@ class ProductImage extends \yii\db\ActiveRecord
      */
     public function getImageFile()
     {
-        return isset($this->image) ? '/images/products/' . $this->image : null;
+        return isset($this->image) ? '/storage/products/' . $this->image : null;
     }
 
     /**
@@ -107,7 +107,7 @@ class ProductImage extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         // return a default image placeholder if your source image is not found
-        return isset($this->image) ? '/images/products/'. $this->image : '/images/no_photo.png';
+        return isset($this->image) ? '/storage/products/'. $this->image : '/storage/no_photo.png';
     }
 
     /**
diff --git a/common/modules/product/models/ProductVariantListSearch.php b/common/modules/product/models/ProductVariantListSearch.php
new file mode 100644
index 0000000..4593951
--- /dev/null
+++ b/common/modules/product/models/ProductVariantListSearch.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+
+/**
+ * ProductVariantSearch represents the model behind the search form about `backend\models\ProductVariant`.
+ */
+class ProductVariantListSearch extends ProductVariant
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['product_variant_id', 'product_id', 'product_unit_id', 'product_variant_type_id'], 'integer'],
+            [['name', 'sku', 'remote_id'], 'safe'],
+            [['price', 'price_old', 'stock'], 'number'],
+        ];
+    }
+
+    /**
+     * @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, $product_id = false)
+    {
+        $query = ProductVariant::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;
+        }
+
+        if($product_id){
+            $query->andFilterWhere([
+                'product_id' => $product_id,
+            ]);
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'product_variant_id' => $this->product_variant_id,
+            'price' => $this->price,
+            'price_old' => $this->price_old,
+            'stock' => $this->stock,
+            'product_unit_id' => $this->product_unit_id,
+            'product_variant_type_id' => $this->product_variant_type_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'sku', $this->sku])
+            ->andFilterWhere(['like', 'remote_id', $this->remote_id]);
+
+        return $dataProvider;
+    }
+}
diff --git a/common/modules/product/views/variant/_form.php b/common/modules/product/views/variant/_form.php
index 9aa37c3..5e8cc89 100644
--- a/common/modules/product/views/variant/_form.php
+++ b/common/modules/product/views/variant/_form.php
@@ -23,82 +23,33 @@ use kartik\select2\Select2;
 
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'product_id')->hiddenInput()->label(''); ?>
+    <?= $form->field($model, 'product_id')->hiddenInput()->label(false); ?>
 
     <?= $form->field($model, 'sku')->textarea(); ?>
     <?= $form->field($model, 'price')->textarea(); ?>
     <?= $form->field($model, 'price_old')->textarea(); ?>
-
-    <?= $form->field($model, 'imagesUpload[]')->widget(\kartik\file\FileInput::classname(), [
-        'language' => 'ru',
+    <?php var_dump($model->imageUrl)?>
+    <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
+        'model' => $model,
+        'attribute' => 'image',
         'options' => [
             'accept' => 'image/*',
-            'multiple' => true,
+            'multiple' => true
         ],
         'pluginOptions' => [
-            'allowedFileExtensions' => ['jpg', 'gif', 'png'],
-            'initialPreview' => !empty($model->imagesHTML) ? $model->imagesHTML : [],
-            'initialPreviewConfig' => $model->imagesConfig,
-            'overwriteInitial' => false,
-            'showRemove' => false,
+            'allowedFileExtensions' => ['jpg','gif','png'],
+            'initialPreview' => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'products') : '',
+            'overwriteInitial' => true,
+            'showRemove' => true,
             'showUpload' => false,
-//            'uploadUrl' => empty($model->product_id) ? null : \yii\helpers\Url::to(['/product/manage/uploadImage']),
-            'uploadAsync' => !empty($model->product_id),
-            'previewFileType' => 'image',
         ],
     ]); ?>
 
-    <?php /*= $form->field($model, 'variants')->widget(MultipleInput::className(), [
-        'columns' => [
-            [
-                'name'  => 'product_variant_id',
-                'type'  => MultipleInputColumn::TYPE_HIDDEN_INPUT,
-            ],
-            [
-                'name'  => 'name',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Name'),
-            ],
-            [
-                'name'  => 'sku',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'SKU'),
-            ],
-            [
-                'name'  => 'price',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Price'),
-            ],
-            [
-                'name'  => 'price_old',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Old Price'),
-            ],
-            [
-                'name'  => 'product_unit_id',
-                'type'  => MultipleInputColumn::TYPE_DROPDOWN,
-                'title' => Yii::t('product', 'Unit'),
-                'items' => ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
-            ],
-            [
-                'name'  => 'stock',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Stock'),
-                'options' => [
-                    'placeholder' => '∞'
-                ],
-            ],
-            [
-                'name'  => 'image',
-                'type'  => 'fileInput',
-                'title' => Yii::t('product', 'Image'),
-                'options' => [
-                    'multiple' => false
-                ],
-            ],
-        ],
-    ]);
-    */ ?>
+    <?= $form->field($model, 'product_unit_id')->dropDownList(
+        ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
+        [
+            'prompt' => Yii::t('product', 'Unit'),
+        ])->label(Yii::t('product', 'Unit')) ?>
 
     <?php if(isset($groups)) :?>
     <?php  foreach($groups->all() as $group) :?>
diff --git a/common/modules/product/views/variant/index.php b/common/modules/product/views/variant/index.php
index 696ba91..4355909 100644
--- a/common/modules/product/views/variant/index.php
+++ b/common/modules/product/views/variant/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $searchModel common\modules\product\models\ProductVariantSearch */
@@ -24,7 +25,7 @@ if (!empty($product)) {
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a(Yii::t('product', 'Create Variant'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('product', 'Create Variant'), Url::toRoute(['create','product_id'=> $product_id]), ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -55,7 +56,41 @@ if (!empty($product)) {
             'price_old',
             'stock',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            [
+                'class'          => 'yii\grid\ActionColumn',
+                'buttons'        => [
+                    'view' => function ($url, $model)
+                    {
+                        return Html::a (
+                            '<span class="glyphicon glyphicon-eye-open"></span>',
+                            Url::to(['view','product_id'=> $model->product_id, 'id' => $model->product_variant_id]),
+                            [
+                                'title' => "Просмотр",
+                            ]
+                        );
+                    },
+                    'update' => function ($url, $model)
+                    {
+                        return Html::a (
+                            '<span class="glyphicon glyphicon-pencil"></span>',
+                            Url::to(['update','product_id'=> $model->product_id, 'id' => $model->product_variant_id]),
+                            [
+                                'title' => "Редактировать",
+                            ]
+                        );
+                    },
+                    'delete' => function ($url, $model)
+                    {
+
+                        return Html::a('<span class="glyphicon glyphicon-trash"></span>',  Url::to(['delete','product_id'=> $model->product_id, 'id' => $model->product_variant_id]), [
+                            'title' => Yii::t('yii', 'Delete'),
+                            'data-confirm' => Yii::t('yii', 'Are you sure to delete this item?'),
+                            'data-method' => 'post',
+                        ]);
+
+                    },
+                ],
+            ],
         ],
     ]); ?>
 </div>
diff --git a/common/modules/product/views/variant/update.php b/common/modules/product/views/variant/update.php
index 8603dad..a5f6e31 100644
--- a/common/modules/product/views/variant/update.php
+++ b/common/modules/product/views/variant/update.php
@@ -1,6 +1,7 @@
 <?php
 
 use yii\helpers\Html;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $model common\modules\product\models\Product */
@@ -10,8 +11,7 @@ $this->title = Yii::t('product', 'Update {modelClass}: ', [
 ]) . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Products'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->product->name, 'url' => ['view', 'id' => $model->product->product_id]];
-$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Variants'), 'url' => ['/product/variant?product_id='. $model->product->product_id]];
-$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->product_variant_id]];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Variants'), 'url' => Url::to(['/product/variant', 'product_id' => $model->product->product_id])];
 $this->params['breadcrumbs'][] = Yii::t('product', 'Update');
 ?>
 <div class="product-update">
diff --git a/common/modules/rubrication/controllers/TaxGroupController.php b/common/modules/rubrication/controllers/TaxGroupController.php
index b8483a9..30c37b9 100755
--- a/common/modules/rubrication/controllers/TaxGroupController.php
+++ b/common/modules/rubrication/controllers/TaxGroupController.php
@@ -32,16 +32,18 @@ class TaxGroupController extends Controller
 
     /**
      * Lists all TaxGroup models.
+     * @param $level integer
      * @return mixed
      */
-    public function actionIndex()
+    public function actionIndex($level)
     {
         $dataProvider = new ActiveDataProvider([
-            'query' => TaxGroup::find(),
+            'query' => TaxGroup::find()->where(['level' => $level]),
         ]);
 
         return $this->render('index', [
             'dataProvider' => $dataProvider,
+            'level' => $level
         ]);
     }
 
@@ -50,7 +52,7 @@ class TaxGroupController extends Controller
      * @param integer $id
      * @return mixed
      */
-    public function actionView($id)
+    public function actionView($level,$id)
     {
         return $this->render('view', [
             'model' => $this->findModel($id),
@@ -60,14 +62,17 @@ class TaxGroupController extends Controller
     /**
      * Creates a new TaxGroup model.
      * If creation is successful, the browser will be redirected to the 'view' page.
+     * @param $level integer
      * @return mixed
      */
-    public function actionCreate()
+    public function actionCreate($level)
     {
         $model = new TaxGroup();
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->tax_group_id]);
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+            $model->level  = $level;
+            $model->save();
+            return $this->redirect(['index', 'level' => $level]);
         } else {
             return $this->render('create', [
                 'model' => $model,
@@ -78,15 +83,16 @@ class TaxGroupController extends Controller
     /**
      * Updates an existing TaxGroup model.
      * If update is successful, the browser will be redirected to the 'view' page.
+     * @param $level integer
      * @param integer $id
      * @return mixed
      */
-    public function actionUpdate($id)
+    public function actionUpdate($level,$id)
     {
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->tax_group_id]);
+            return $this->redirect(['index', 'level' => $level]);
         } else {
             return $this->render('update', [
                 'model' => $model,
@@ -97,14 +103,14 @@ class TaxGroupController extends Controller
     /**
      * Deletes an existing TaxGroup model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param $level integer
      * @param integer $id
      * @return mixed
      */
-    public function actionDelete($id)
+    public function actionDelete($level,$id)
     {
         $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
+        return $this->redirect(['index', 'level' => $level]);
     }
 
     /*
diff --git a/common/modules/rubrication/models/TaxGroup.php b/common/modules/rubrication/models/TaxGroup.php
index 2e647c1..3679faa 100755
--- a/common/modules/rubrication/models/TaxGroup.php
+++ b/common/modules/rubrication/models/TaxGroup.php
@@ -16,7 +16,7 @@ use Yii;
  * @property boolean $hierarchical
  * @property string $settings
  * @property boolean $is_filter
- *
+ * @property integer $level
  * @property TaxGroupToGroup[] $taxGroupToGroups
  * @property TaxGroupToGroup[] $taxGroupToGroups0
  * @property TaxOption[] $taxOptions
@@ -63,6 +63,7 @@ class TaxGroup extends \yii\db\ActiveRecord
             [['name', 'module'], 'required'],
             [['description', 'settings'], 'string'],
             [['hierarchical', 'is_filter'], 'boolean'],
+            [['level'], 'integer'],
             [['alias', 'module'], 'string', 'max' => 50],
             [['name'], 'string', 'max' => 255],
             [['group_to_category'], 'safe']
diff --git a/common/modules/rubrication/models/TaxOption.php b/common/modules/rubrication/models/TaxOption.php
index 256a04d..8313a7c 100755
--- a/common/modules/rubrication/models/TaxOption.php
+++ b/common/modules/rubrication/models/TaxOption.php
@@ -69,7 +69,7 @@ class TaxOption extends \yii\db\ActiveRecord
     {
         return [
             [['tax_group_id'], 'required'],
-            [['tax_group_id', 'parent_id', 'sort', 'default_value'], 'integer'],
+            [['tax_group_id', 'level', 'parent_id', 'sort', 'default_value'], 'integer'],
             [['alias'], 'string', 'max' => 50],
             [['tax_group_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxGroup::className(), 'targetAttribute' => ['tax_group_id' => 'tax_group_id']],
 //            [['parent_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxOption::className(), 'targetAttribute' => ['parent_id' => 'tax_option_id']],
diff --git a/common/modules/rubrication/views/tax-group/index.php b/common/modules/rubrication/views/tax-group/index.php
index cc3605a..705eff0 100755
--- a/common/modules/rubrication/views/tax-group/index.php
+++ b/common/modules/rubrication/views/tax-group/index.php
@@ -1,7 +1,10 @@
 <?php
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\Url;
+
 /* @var $this yii\web\View */
+/* @var $level integer
 /* @var $dataProvider yii\data\ActiveDataProvider */
 
 $this->title = Yii::t('rubrication', 'Groups');
@@ -12,7 +15,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a(Yii::t('rubrication', 'Create Group'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('rubrication', 'Create Group'), Url::to(['/rubrication/tax-group/create', 'level'=> $level]), ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= GridView::widget([
@@ -48,7 +51,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         ]);
                     }
                 ],
-                'urlCreator' => function ($action, $model, $key, $index) {
+                'urlCreator' => function ($action, $model, $key, $index) use ($level) {
                     if ($action === 'options') {
                         $url ='/admin/rubrication/tax-option?group='.$model->tax_group_id;
                         return $url;
@@ -56,10 +59,10 @@ $this->params['breadcrumbs'][] = $this->title;
                         $url ='/admin/rubrication/tax-group/relation&id='.$model->tax_group_id;
                         return $url;
                     } elseif ($action === 'update') {
-                        $url ='/admin/rubrication/tax-group/update?id='.$model->tax_group_id;
+                        $url =Url::to(['/rubrication/tax-group/update', 'level'=> $level,'id' =>$model->tax_group_id]);
                         return $url;
                     } elseif ($action === 'delete') {
-                        $url ='/admin/rubrication/tax-group/delete?id='.$model->tax_group_id;
+                        $url =Url::to(['/rubrication/tax-group/delete', 'level'=> $level,'id' =>$model->tax_group_id]);
                         return $url;
                     } elseif ($action === 'rebuild') {
                         $url ='/admin/rubrication/tax-group/rebuild?id='.$model->tax_group_id;
diff --git a/console/migrations/m160414_214746_add_level_to_tax_group.php b/console/migrations/m160414_214746_add_level_to_tax_group.php
new file mode 100755
index 0000000..a44ba08
--- /dev/null
+++ b/console/migrations/m160414_214746_add_level_to_tax_group.php
@@ -0,0 +1,26 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles adding the columns `key`
+ * for table `seo_dynamic`.
+ */
+class m160414_214746_add_level_to_tax_group extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up()
+    {
+        $this->addColumn('tax_group', 'level', $this->integer());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function down()
+    {
+        $this->dropColumn('tax_group', 'level');
+    }
+}
--
libgit2 0.21.4