From 85261b1444345649e5f9c92c0a5c3896ecba479d Mon Sep 17 00:00:00 2001
From: Karnovsky A <Karnovsky.a@gmail.com>
Date: Wed, 23 Mar 2016 18:01:56 +0200
Subject: [PATCH] not fixed commite

---
 .gitignore                                                          |   6 +++++-
 backend/controllers/BrandController.php                             | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/controllers/CategoryController.php                          | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/views/brand/_form.php                                       |  51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/views/brand/_search.php                                     |  41 +++++++++++++++++++++++++++++++++++++++++
 backend/views/brand/create.php                                      |  21 +++++++++++++++++++++
 backend/views/brand/index.php                                       |  33 +++++++++++++++++++++++++++++++++
 backend/views/brand/update.php                                      |  23 +++++++++++++++++++++++
 backend/views/brand/view.php                                        |  42 ++++++++++++++++++++++++++++++++++++++++++
 backend/views/category/_form.php                                    |  63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/views/category/_search.php                                  |  49 +++++++++++++++++++++++++++++++++++++++++++++++++
 backend/views/category/create.php                                   |  22 ++++++++++++++++++++++
 backend/views/category/index.php                                    |  42 ++++++++++++++++++++++++++++++++++++++++++
 backend/views/category/update.php                                   |  24 ++++++++++++++++++++++++
 backend/views/category/view.php                                     |  50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/web/index-test.php                                          |  19 +++++++++++++++++++
 backend/web/index.php                                               |  19 +++++++++++++++++++
 common/modules/product/models/Brand.php                             | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/BrandName.php                         |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/BrandQuery.php                        |  34 ++++++++++++++++++++++++++++++++++
 common/modules/product/models/BrandSearch.php                       |  75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/Category.php                          | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/CategoryName.php                      |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/CategoryQuery.php                     |  48 ++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/CategorySearch.php                    |  99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/ProductUnit.php                       |  69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/widgets/catalogSubmenuWidget.php             |  26 ++++++++++++++++++++++++++
 common/modules/rubrication/models/TaxValueFloat.php                 |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/rubrication/views/tax-option/value/_fields_float.php |   1 +
 frontend/controllers/CatalogController.php                          |  53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/views/catalog/categories.php                               |  45 +++++++++++++++++++++++++++++++++++++++++++++
 31 files changed, 1669 insertions(+), 1 deletion(-)
 create mode 100644 backend/controllers/BrandController.php
 create mode 100644 backend/controllers/CategoryController.php
 create mode 100644 backend/views/brand/_form.php
 create mode 100644 backend/views/brand/_search.php
 create mode 100644 backend/views/brand/create.php
 create mode 100644 backend/views/brand/index.php
 create mode 100644 backend/views/brand/update.php
 create mode 100644 backend/views/brand/view.php
 create mode 100644 backend/views/category/_form.php
 create mode 100644 backend/views/category/_search.php
 create mode 100644 backend/views/category/create.php
 create mode 100644 backend/views/category/index.php
 create mode 100644 backend/views/category/update.php
 create mode 100644 backend/views/category/view.php
 create mode 100644 backend/web/index-test.php
 create mode 100644 backend/web/index.php
 create mode 100644 common/modules/product/models/Brand.php
 create mode 100644 common/modules/product/models/BrandName.php
 create mode 100644 common/modules/product/models/BrandQuery.php
 create mode 100644 common/modules/product/models/BrandSearch.php
 create mode 100644 common/modules/product/models/Category.php
 create mode 100644 common/modules/product/models/CategoryName.php
 create mode 100644 common/modules/product/models/CategoryQuery.php
 create mode 100644 common/modules/product/models/CategorySearch.php
 create mode 100644 common/modules/product/models/ProductUnit.php
 create mode 100644 common/modules/product/widgets/catalogSubmenuWidget.php
 create mode 100644 common/modules/rubrication/models/TaxValueFloat.php
 create mode 100644 common/modules/rubrication/views/tax-option/value/_fields_float.php
 create mode 100644 frontend/controllers/CatalogController.php
 create mode 100644 frontend/views/catalog/categories.php

diff --git a/.gitignore b/.gitignore
index 3973ae3..35f921c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,8 @@ common/config/params-local.php
 backend/config/main-local.php
 backend/config/params-local.php
 frontend/config/main-local.php
-frontend/config/params-local.php
\ No newline at end of file
+frontend/config/params-local.php
+
+backend/web/assets/
+frontend/web/assets/
+frontend/web/css/node_modules/
\ No newline at end of file
diff --git a/backend/controllers/BrandController.php b/backend/controllers/BrandController.php
new file mode 100644
index 0000000..84ff5f6
--- /dev/null
+++ b/backend/controllers/BrandController.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\modules\product\models\Brand;
+use common\modules\product\models\BrandSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * BrandController implements the CRUD actions for Brand model.
+ */
+class BrandController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Brand models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new BrandSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Brand model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Brand model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Brand();
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect(['view', 'id' => $model->brand_id]) : $this->redirect(array_merge(['create'], Yii::$app->request->queryParams));
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Brand 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->brand_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Brand 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 Brand model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Brand the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Brand::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/controllers/CategoryController.php b/backend/controllers/CategoryController.php
new file mode 100644
index 0000000..6844d47
--- /dev/null
+++ b/backend/controllers/CategoryController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace backend\controllers;
+
+use common\components\artboxtree\ArtboxTreeHelper;
+use Yii;
+use common\modules\product\models\Category;
+use common\modules\product\models\CategorySearch;
+use yii\helpers\ArrayHelper;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * CategoryController implements the CRUD actions for Category model.
+ */
+class CategoryController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Category models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CategorySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Category model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Category model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Category();
+
+        if ($model->load(Yii::$app->request->post())) {
+            $model->save();
+            return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect(['view', 'id' => $model->category_id]) : $this->redirect(array_merge(['create'], Yii::$app->request->queryParams));
+        } else {
+            if (!empty(Yii::$app->request->queryParams['parent'])) {
+                $model->parent_id = Yii::$app->request->queryParams['parent'];
+            }
+            return $this->render('create', [
+                'model' => $model,
+                'categories' => ArtboxTreeHelper::treeMap(Category::find()->getTree(), 'category_id', 'name', '.')
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Category 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->category_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+                'categories' => ArtboxTreeHelper::treeMap(Category::find()->getTree(), 'category_id', 'name', '.')
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Category 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 Category model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Category the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Category::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/views/brand/_form.php b/backend/views/brand/_form.php
new file mode 100644
index 0000000..2d9c553
--- /dev/null
+++ b/backend/views/brand/_form.php
@@ -0,0 +1,51 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Brand */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="brand-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput() ?>
+
+    <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
+
+    <?= \common\modules\file\widgets\ImageUploader::widget([
+        'model'=> $model,
+        'field'=>'image',
+        'size' => [
+            [
+                'width'=>102,
+                'height'=>57,
+            ]
+        ],
+        'multi'=>false,
+        'gallery' => $model->image,
+        'name' => 'Загрузить изображение'
+    ]);
+    ?>
+
+    <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'meta_desc')->textarea(['rows' => 6]) ?>
+
+    <?= $form->field($model, 'meta_robots')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?php if ($model->isNewRecord) :?>
+            <?= Html::submitButton(Yii::t('product', 'Create and continue'), ['name' => 'create_and_new', 'class' =>  'btn btn-primary']) ?>
+        <?php endif?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/brand/_search.php b/backend/views/brand/_search.php
new file mode 100644
index 0000000..967088a
--- /dev/null
+++ b/backend/views/brand/_search.php
@@ -0,0 +1,41 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\BrandSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="brand-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'brand_id') ?>
+
+    <?= $form->field($model, 'brand_name_id') ?>
+
+    <?= $form->field($model, 'alias') ?>
+
+    <?= $form->field($model, 'image') ?>
+
+    <?= $form->field($model, 'meta_title') ?>
+
+    <?php // echo $form->field($model, 'meta_desc') ?>
+
+    <?php // echo $form->field($model, 'meta_robots') ?>
+
+    <?php // echo $form->field($model, 'seo_text') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('product', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('product', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/brand/create.php b/backend/views/brand/create.php
new file mode 100644
index 0000000..e0d4833
--- /dev/null
+++ b/backend/views/brand/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Brand */
+
+$this->title = Yii::t('product', 'Create Brand');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Brands'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="brand-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/brand/index.php b/backend/views/brand/index.php
new file mode 100644
index 0000000..b0a0619
--- /dev/null
+++ b/backend/views/brand/index.php
@@ -0,0 +1,33 @@
+<?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;
+?>
+<div class="brand-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('product', 'Create Brand'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+//        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'name',
+            'alias',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>
diff --git a/backend/views/brand/update.php b/backend/views/brand/update.php
new file mode 100644
index 0000000..7b60ab0
--- /dev/null
+++ b/backend/views/brand/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Brand */
+
+$this->title = Yii::t('product', 'Update {modelClass}: ', [
+    'modelClass' => 'Brand',
+]) . ' ' . $model->brand_id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Brands'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->brand_id, 'url' => ['view', 'id' => $model->brand_id]];
+$this->params['breadcrumbs'][] = Yii::t('product', 'Update');
+?>
+<div class="brand-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/brand/view.php b/backend/views/brand/view.php
new file mode 100644
index 0000000..8180ef0
--- /dev/null
+++ b/backend/views/brand/view.php
@@ -0,0 +1,42 @@
+<?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;
+?>
+<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], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('product', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'brand_id',
+            'brand_name_id',
+            'alias',
+            'image',
+            'meta_title',
+            'meta_desc:ntext',
+            'meta_robots',
+            'seo_text:ntext',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/category/_form.php b/backend/views/category/_form.php
new file mode 100644
index 0000000..ae860cf
--- /dev/null
+++ b/backend/views/category/_form.php
@@ -0,0 +1,63 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\modules\file\widgets\ImageUploader;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Category */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="category-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput() ?>
+
+    <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'parent_id')->dropDownList($categories, [
+        'prompt' => Yii::t('rubrication', 'Root category'),
+        'options' => [
+            $model->category_id => ['disabled' => true]
+        ]
+    ])->label(Yii::t('product', 'Parent category')) ?>
+
+    <?= ImageUploader::widget([
+        'model'=> $model,
+        'field'=>'image',
+        'size' => [
+            [
+                'width'=>340,
+                'height'=>260,
+            ]
+        ],
+        'multi'=>false,
+        'gallery' => $model->image,
+        'name' => 'Загрузить изображение'
+    ]);
+    ?>
+
+    <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'meta_desc')->textarea(['rows' => 6]) ?>
+
+    <?= $form->field($model, 'meta_robots')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
+
+    <?php if (!empty($model) && $model->depth == 2) :?>
+    <?= $form->field($model, 'populary')->checkbox() ?>
+    <?php endif?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?php if ($model->isNewRecord) :?>
+            <?= Html::submitButton(Yii::t('product', 'Create and continue'), ['name' => 'create_and_new', 'class' =>  'btn btn-primary']) ?>
+        <?php endif?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/category/_search.php b/backend/views/category/_search.php
new file mode 100644
index 0000000..f098041
--- /dev/null
+++ b/backend/views/category/_search.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\CategorySearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="category-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'category_id') ?>
+
+    <?= $form->field($model, 'parent_id') ?>
+
+    <?= $form->field($model, 'path') ?>
+
+    <?= $form->field($model, 'depth') ?>
+
+    <?= $form->field($model, 'image') ?>
+
+    <?php // echo $form->field($model, 'meta_title') ?>
+
+    <?php // echo $form->field($model, 'meta_desc') ?>
+
+    <?php // echo $form->field($model, 'meta_robots') ?>
+
+    <?php // echo $form->field($model, 'seo_text') ?>
+
+    <?php // echo $form->field($model, 'category_name_id') ?>
+
+    <?php // echo $form->field($model, 'product_unit_id') ?>
+
+    <?php // echo $form->field($model, 'alias') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('product', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('product', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/category/create.php b/backend/views/category/create.php
new file mode 100644
index 0000000..9ca39fb
--- /dev/null
+++ b/backend/views/category/create.php
@@ -0,0 +1,22 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Category */
+
+$this->title = Yii::t('product', 'Create Category');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="category-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'categories' => $categories
+    ]) ?>
+
+</div>
diff --git a/backend/views/category/index.php b/backend/views/category/index.php
new file mode 100644
index 0000000..876474e
--- /dev/null
+++ b/backend/views/category/index.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\modules\product\models\CategorySearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('product', 'Categories');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="category-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('product', 'Create Category'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+//        'filterModel' => $searchModel,
+        'columns' => [
+            [
+                'label'=> Yii::t('rubrication', 'Name'),
+                'content'=>function($data){
+                    return str_repeat('-', $data->depth) .'&nbsp;'. $data->name;
+                }
+            ],
+            'alias',
+            'populary:boolean',
+            // 'meta_title',
+            // 'meta_desc:ntext',
+            // 'meta_robots',
+            // 'seo_text:ntext',
+            // 'product_unit_id',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>
diff --git a/backend/views/category/update.php b/backend/views/category/update.php
new file mode 100644
index 0000000..0f19387
--- /dev/null
+++ b/backend/views/category/update.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Category */
+
+$this->title = Yii::t('product', 'Update {modelClass}: ', [
+    'modelClass' => 'Category',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->category_id]];
+$this->params['breadcrumbs'][] = Yii::t('product', 'Update');
+?>
+<div class="category-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'categories' => $categories
+    ]) ?>
+
+</div>
diff --git a/backend/views/category/view.php b/backend/views/category/view.php
new file mode 100644
index 0000000..d68ed18
--- /dev/null
+++ b/backend/views/category/view.php
@@ -0,0 +1,50 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\Category */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<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], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('product', 'Are you sure you want to delete this item?'),
+                '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->name]), ['category/create?parent='. $model->parent->category_id], ['class' => 'btn btn-success']) ?>
+        <?php endif?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'category_id',
+            'parent_id',
+            'path',
+            'depth',
+            'image',
+            'meta_title',
+            'meta_desc:ntext',
+            'meta_robots',
+            'seo_text:ntext',
+            'category_name_id',
+            'product_unit_id',
+            'alias',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/web/index-test.php b/backend/web/index-test.php
new file mode 100644
index 0000000..8b96707
--- /dev/null
+++ b/backend/web/index-test.php
@@ -0,0 +1,19 @@
+<?php
+
+// NOTE: Make sure this file is not accessible when deployed to production
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
+    die('You are not allowed to access this file.');
+}
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
+
+
+$config = require(__DIR__ . '/../../tests/codeception/config/backend/acceptance.php');
+
+(new yii\web\Application($config))->run();
diff --git a/backend/web/index.php b/backend/web/index.php
new file mode 100644
index 0000000..99030fa
--- /dev/null
+++ b/backend/web/index.php
@@ -0,0 +1,19 @@
+<?php
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'dev');
+
+require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(__DIR__ . '/../config/main.php'),
+    require(__DIR__ . '/../config/main-local.php'),
+    require(__DIR__ . '/../../common/config/main.php'),
+    require(__DIR__ . '/../../common/config/main-local.php')
+
+);
+
+$application = new yii\web\Application($config);
+$application->run();
diff --git a/common/modules/product/models/Brand.php b/common/modules/product/models/Brand.php
new file mode 100644
index 0000000..68e9d0e
--- /dev/null
+++ b/common/modules/product/models/Brand.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace common\modules\product\models;
+
+use common\behaviors\Slug;
+use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
+use Yii;
+
+/**
+ * This is the model class for table "brand".
+ *
+ * @property integer $brand_id
+ * @property integer $brand_name_id
+ * @property string $alias
+ * @property string $image
+ * @property string $meta_title
+ * @property string $meta_desc
+ * @property string $meta_robots
+ * @property string $seo_text
+ *
+ * @property BrandName $brandName
+ * @property BrandName[] $brandNames
+ * @property Product[] $products
+ */
+class Brand extends \yii\db\ActiveRecord
+{
+    public function behaviors()
+    {
+        return [
+            'slug' => [
+                'class' => Slug::className(),
+                'in_attribute' => 'name',
+                'out_attribute' => 'alias',
+                'translit' => true
+            ],
+            'artboxsynonym' => [
+                'class' => ArtboxSynonymBehavior::className(),
+                'keyNameValue' => 'brand_name_id',
+                'valueModel' => BrandName::className(),
+                'valueOptionId' => 'brand_id',
+                'valueFields' => [ // postKey => DBFieldName
+                    'name' => 'value'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'brand';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['brand_name_id'], 'integer'],
+            [['meta_desc', 'seo_text'], 'string'],
+            [['alias', 'name'], 'string', 'max' => 250],
+            [['image', 'meta_title'], 'string', 'max' => 255],
+            [['meta_robots'], 'string', 'max' => 50],
+//            [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'brand_id' => Yii::t('product', 'Brand ID'),
+            'brand_name_id' => Yii::t('product', 'Brand Name ID'),
+            'alias' => Yii::t('product', 'Alias'),
+            'image' => Yii::t('product', 'Image'),
+            'meta_title' => Yii::t('product', 'Meta Title'),
+            'meta_desc' => Yii::t('product', 'Meta Desc'),
+            'meta_robots' => Yii::t('product', 'Meta Robots'),
+            'seo_text' => Yii::t('product', 'Seo Text'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getBrandName()
+    {
+        return $this->hasOne(BrandName::className(), ['brand_name_id' => 'brand_name_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getBrandNames()
+    {
+        return $this->hasMany(BrandName::className(), ['brand_id' => 'brand_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProducts()
+    {
+        return $this->hasMany(Product::className(), ['brand_id' => 'brand_id']);
+    }
+
+    public function getName() {
+        $value = $this->getBrandName()->one();
+        return empty($value) ? $this->_getValue('name') : $value->value;
+    }
+}
diff --git a/common/modules/product/models/BrandName.php b/common/modules/product/models/BrandName.php
new file mode 100644
index 0000000..5bab547
--- /dev/null
+++ b/common/modules/product/models/BrandName.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "brand_name".
+ *
+ * @property integer $brand_name_id
+ * @property integer $brand_id
+ * @property string $value
+ *
+ * @property Brand[] $brands
+ * @property Brand $brand
+ */
+class BrandName extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'brand_name';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['brand_id'], 'integer'],
+            [['value'], 'string', 'max' => 250],
+//            [['brand_id'], 'exist', 'skipOnError' => true, 'targetClass' => Brand::className(), 'targetAttribute' => ['brand_id' => 'brand_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'brand_name_id' => Yii::t('product', 'Brand Name ID'),
+            'brand_id' => Yii::t('product', 'Brand ID'),
+            'value' => Yii::t('product', 'Value'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getBrands()
+    {
+        return $this->hasMany(Brand::className(), ['brand_name_id' => 'brand_name_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getBrand()
+    {
+        return $this->hasOne(Brand::className(), ['brand_id' => 'brand_id']);
+    }
+}
diff --git a/common/modules/product/models/BrandQuery.php b/common/modules/product/models/BrandQuery.php
new file mode 100644
index 0000000..a0d1273
--- /dev/null
+++ b/common/modules/product/models/BrandQuery.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace common\modules\product\models;
+
+/**
+ * This is the ActiveQuery class for [[Brand]].
+ *
+ * @see Brand
+ */
+class BrandQuery extends \yii\db\ActiveQuery
+{
+    /*public function active()
+    {
+        return $this->andWhere('[[status]]=1');
+    }*/
+
+    /**
+     * @inheritdoc
+     * @return Brand[]|array
+     */
+    public function all($db = null)
+    {
+        return parent::all($db);
+    }
+
+    /**
+     * @inheritdoc
+     * @return Brand|array|null
+     */
+    public function one($db = null)
+    {
+        return parent::one($db);
+    }
+}
diff --git a/common/modules/product/models/BrandSearch.php b/common/modules/product/models/BrandSearch.php
new file mode 100644
index 0000000..0fb516f
--- /dev/null
+++ b/common/modules/product/models/BrandSearch.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\modules\product\models\Brand;
+
+/**
+ * BrandSearch represents the model behind the search form about `common\modules\product\models\Brand`.
+ */
+class BrandSearch extends Brand
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['brand_id', 'brand_name_id'], 'integer'],
+            [['alias', 'image', 'meta_title', 'meta_desc', 'meta_robots', 'seo_text'], '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 = 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;
+        }*/
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'brand_id' => $this->brand_id,
+            'brand_name_id' => $this->brand_name_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'alias', $this->alias])
+            ->andFilterWhere(['like', 'image', $this->image])
+            ->andFilterWhere(['like', 'meta_title', $this->meta_title])
+            ->andFilterWhere(['like', 'meta_desc', $this->meta_desc])
+            ->andFilterWhere(['like', 'meta_robots', $this->meta_robots])
+            ->andFilterWhere(['like', 'seo_text', $this->seo_text]);
+
+        return $dataProvider;
+    }
+}
diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php
new file mode 100644
index 0000000..2b5be1b
--- /dev/null
+++ b/common/modules/product/models/Category.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace common\modules\product\models;
+
+use common\behaviors\Slug;
+use common\components\artboxtree\ArtboxTreeBehavior;
+use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
+use Yii;
+
+/**
+ * This is the model class for table "category".
+ *
+ * @property integer $category_id
+ * @property integer $parent_id
+ * @property string $path
+ * @property integer $depth
+ * @property string $image
+ * @property string $meta_title
+ * @property string $meta_desc
+ * @property string $meta_robots
+ * @property string $seo_text
+ * @property integer $category_name_id
+ * @property integer $product_unit_id
+ * @property string $alias
+ * @property boolean $populary
+ *
+ * @property CategoryName $categoryName
+ * @property ProductUnit $productUnit
+ * @property CategoryName[] $categoryNames
+ * @property ProductCategory[] $productCategories
+ */
+class Category extends \yii\db\ActiveRecord
+{
+    public function behaviors()
+    {
+        return [
+            'artboxtree' => [
+                'class' => ArtboxTreeBehavior::className(),
+                'keyNameGroup' => null,
+                'keyNamePath' => 'path',
+            ],
+            'slug' => [
+                'class' => Slug::className(),
+                'in_attribute' => 'name',
+                'out_attribute' => 'alias',
+                'translit' => true
+            ],
+            'artboxsynonym' => [
+                'class' => ArtboxSynonymBehavior::className(),
+                'keyNameValue' => 'category_name_id',
+                'valueModel' => CategoryName::className(),
+                'valueOptionId' => 'category_id',
+                'valueFields' => [ // postKey => DBFieldName
+                    'name' => 'value'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'category';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['parent_id', 'depth', 'category_name_id', 'product_unit_id'], 'integer'],
+            [['path', 'meta_desc', 'seo_text'], 'string'],
+            [['image', 'meta_title'], 'string', 'max' => 255],
+            [['meta_robots'], 'string', 'max' => 50],
+            [['alias', 'name'], 'string', 'max' => 250],
+            [['populary'], 'boolean']
+//            [['product_unit_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductUnit::className(), 'targetAttribute' => ['product_unit_id' => 'product_unit_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'category_id' => Yii::t('product', 'Category ID'),
+            'parent_id' => Yii::t('product', 'Parent ID'),
+            'path' => Yii::t('product', 'Path'),
+            'depth' => Yii::t('product', 'Depth'),
+            'image' => Yii::t('product', 'Image'),
+            'meta_title' => Yii::t('product', 'Meta Title'),
+            'meta_desc' => Yii::t('product', 'Meta Desc'),
+            'meta_robots' => Yii::t('product', 'Meta Robots'),
+            'seo_text' => Yii::t('product', 'Seo Text'),
+            'product_unit_id' => Yii::t('product', 'Product Unit ID'),
+            'alias' => Yii::t('product', 'Alias'),
+            'populary' => Yii::t('product', 'Populary'),
+        ];
+    }
+
+    public static function find() {
+        return new CategoryQuery(get_called_class());
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProductUnit()
+    {
+        return $this->hasOne(ProductUnit::className(), ['product_unit_id' => 'product_unit_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategoryNames()
+    {
+        return $this->hasMany(CategoryName::className(), ['category_id' => 'category_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProductCategories()
+    {
+        return $this->hasMany(ProductCategory::className(), ['category_id' => 'category_id']);
+    }
+
+    public function beforeSave($insert)
+    {
+        if (parent::beforeSave($insert)) {
+
+            if (empty($this->parent_id))
+                $this->parent_id = 0;
+            return true;
+        }
+        return false;
+    }
+
+    public function getCategoryName() {
+        return $this->hasOne(CategoryName::className(), ['category_name_id' => 'category_name_id']);
+    }
+
+    public function getName() {
+        $value = $this->getCategoryName()->one();
+        return empty($value) ? $this->_getValue('name') : $value->value;
+    }
+}
diff --git a/common/modules/product/models/CategoryName.php b/common/modules/product/models/CategoryName.php
new file mode 100644
index 0000000..6c84f3e
--- /dev/null
+++ b/common/modules/product/models/CategoryName.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "category_name".
+ *
+ * @property integer $category_name_id
+ * @property integer $category_id
+ * @property string $value
+ *
+ * @property Category[] $categories
+ * @property Category $category
+ */
+class CategoryName extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'category_name';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['category_id'], 'integer'],
+            [['value'], 'string', 'max' => 250],
+            [['category_id'], 'exist', 'skipOnError' => true, 'targetClass' => Category::className(), 'targetAttribute' => ['category_id' => 'category_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'category_name_id' => Yii::t('product', 'Category Name ID'),
+            'category_id' => Yii::t('product', 'Category ID'),
+            'value' => Yii::t('product', 'Value'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategories()
+    {
+        return $this->hasMany(Category::className(), ['category_name_id' => 'category_name_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategory()
+    {
+        return $this->hasOne(Category::className(), ['category_id' => 'category_id']);
+    }
+}
diff --git a/common/modules/product/models/CategoryQuery.php b/common/modules/product/models/CategoryQuery.php
new file mode 100644
index 0000000..069d8e7
--- /dev/null
+++ b/common/modules/product/models/CategoryQuery.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace common\modules\product\models;
+use common\components\artboxtree\ArtboxTreeQueryTrait;
+
+/**
+ * This is the ActiveQuery class for [[Category]].
+ *
+ * @see Category
+ */
+class CategoryQuery extends \yii\db\ActiveQuery
+{
+    use ArtboxTreeQueryTrait;
+
+    /*public function active()
+    {
+        return $this->andWhere('[[status]]=1');
+    }*/
+
+    /**
+     * @inheritdoc
+     * @return Category[]|array
+     */
+    public function all($db = null)
+    {
+        return parent::all($db);
+    }
+
+    /**
+     * @inheritdoc
+     * @return Category|array|null
+     */
+    public function one($db = null)
+    {
+        return parent::one($db);
+    }
+
+    /**
+     * Select category by alias
+     * @param $slug
+     * @return $this
+     */
+    public function byAlias($alias)
+    {
+        $this->andFilterWhere(['alias' => $alias]);
+        return $this;
+    }
+}
diff --git a/common/modules/product/models/CategorySearch.php b/common/modules/product/models/CategorySearch.php
new file mode 100644
index 0000000..ae60343
--- /dev/null
+++ b/common/modules/product/models/CategorySearch.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\modules\product\models\Category;
+use yii\web\NotFoundHttpException;
+
+/**
+ * CategorySearch represents the model behind the search form about `common\modules\product\models\Category`.
+ */
+class CategorySearch extends Category
+{
+    public function behaviors()
+    {
+        $behaviors = parent::behaviors();
+        if (isset($behaviors['slug'])) {
+            unset($behaviors['slug']);
+        }
+        if (isset($behaviors['timestamp'])) {
+            unset($behaviors['timestamp']);
+        }
+        return $behaviors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['category_id', 'parent_id', 'depth', 'category_name_id', 'product_unit_id'], 'integer'],
+            [['populary'], 'boolean'],
+            [['path', 'image', 'meta_title', 'meta_desc', 'meta_robots', 'seo_text', 'alias'], '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 = Category::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([
+            'category_id' => $this->category_id,
+            'parent_id' => $this->parent_id,
+            'category_name_id' => $this->category_name_id,
+            'product_unit_id' => $this->product_unit_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'alias', $this->alias]);
+
+        $query->orderBy(['path' => SORT_ASC, 'depth' => SORT_ASC]);
+
+        return $dataProvider;
+    }
+
+    public static function findByAlias($alias) {
+        /** @var CategoryQuery $query */
+        $query = Category::find();
+        $query->byAlias($alias);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/common/modules/product/models/ProductUnit.php b/common/modules/product/models/ProductUnit.php
new file mode 100644
index 0000000..6b5eaff
--- /dev/null
+++ b/common/modules/product/models/ProductUnit.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "product_unit".
+ *
+ * @property integer $product_unit_id
+ * @property string $name
+ * @property string $code
+ * @property boolean $is_default
+ *
+ * @property Category[] $categories
+ * @property ProductVariant[] $productVariants
+ */
+class ProductUnit extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'product_unit';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'code'], 'required'],
+            [['is_default'], 'boolean'],
+            [['name'], 'string', 'max' => 255],
+            [['code'], 'string', 'max' => 50],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'product_unit_id' => Yii::t('product', 'Product Unit ID'),
+            'name' => Yii::t('product', 'Name'),
+            'code' => Yii::t('product', 'Code'),
+            'is_default' => Yii::t('product', 'Is Default'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategories()
+    {
+        return $this->hasMany(Category::className(), ['product_unit_id' => 'product_unit_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProductVariants()
+    {
+        return $this->hasMany(ProductVariant::className(), ['product_unit_id' => 'product_unit_id']);
+    }
+}
diff --git a/common/modules/product/widgets/catalogSubmenuWidget.php b/common/modules/product/widgets/catalogSubmenuWidget.php
new file mode 100644
index 0000000..a3cb377
--- /dev/null
+++ b/common/modules/product/widgets/catalogSubmenuWidget.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace common\modules\product\widgets;
+
+use common\modules\product\models\Category;
+use yii\base\Widget;
+
+class catalogSubmenuWidget extends Widget {
+    public $root_id;
+    public $rootClass = '';
+
+    public function init()
+    {
+        parent::init(); // TODO: Change the autogenerated stub
+    }
+
+    public function run() {
+        $rootCategory = Category::findOne($this->root_id);
+        return $this->render('submenu', [
+            'rootCategory' => $rootCategory,
+            'rootClass' => $this->rootClass,
+            'populary' => $rootCategory->getAllChildren(2, ['populary' => true])->all(),
+            'items' => $rootCategory->getAllChildrenTree(2)
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/common/modules/rubrication/models/TaxValueFloat.php b/common/modules/rubrication/models/TaxValueFloat.php
new file mode 100644
index 0000000..df79b56
--- /dev/null
+++ b/common/modules/rubrication/models/TaxValueFloat.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace common\modules\rubrication\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%tax_value_int}}".
+ *
+ * @property integer $tax_value_id
+ * @property integer $tax_option_id
+ * @property integer $value
+ *
+ * @property TaxOption $taxOption
+ */
+class TaxValueFloat extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%tax_value_float}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['tax_option_id'], 'required'],
+            [['tax_option_id'], 'integer'],
+            [['value'], 'number'],
+            [['tax_option_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxOption::className(), 'targetAttribute' => ['tax_option_id' => 'tax_option_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'tax_value_id' => Yii::t('app', 'Tax Value ID'),
+            'tax_option_id' => Yii::t('app', 'Tax Option ID'),
+            'value' => Yii::t('app', 'Value'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getTaxOption()
+    {
+        return $this->hasOne(TaxOption::className(), ['tax_option_id' => 'tax_option_id'])->inverseOf('taxValues');
+    }
+}
diff --git a/common/modules/rubrication/views/tax-option/value/_fields_float.php b/common/modules/rubrication/views/tax-option/value/_fields_float.php
new file mode 100644
index 0000000..6a35b2f
--- /dev/null
+++ b/common/modules/rubrication/views/tax-option/value/_fields_float.php
@@ -0,0 +1 @@
+<?= $form->field($valueModel, 'value')->textInput() ?>
\ No newline at end of file
diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php
new file mode 100644
index 0000000..de8f8dd
--- /dev/null
+++ b/frontend/controllers/CatalogController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace frontend\controllers;
+
+use common\modules\product\models\Category;
+use common\modules\product\models\CategorySearch;
+use common\modules\product\models\Product;
+use yii\web\HttpException;
+
+class CatalogController extends \yii\web\Controller
+{
+    public function actionCategory($alias)
+    {
+        $category = CategorySearch::findByAlias($alias);
+        if ($category->depth < 2) {
+            return $this->render(
+                'categories',
+                [
+                    'category' => $category
+                ]
+            );
+        } else {
+
+            return $this->render(
+                'products',
+                [
+                    'category' => $category,
+                ]
+            );
+        }
+    }
+
+    public function actionProduct($alias)
+    {
+        $product = Product::find()->where('like', ['alias' => $alias]);
+        if (empty($product->product_id)) {
+//            throw new HttpException(404 ,'Page not found');
+//            return $this->redirect('/', 301);
+        }
+        return $this->render('product');
+    }
+
+    public function actionBrands()
+    {
+        return 'actionBrands';
+    }
+
+    public function actionBrand($alias)
+    {
+        return 'actionBrand:'. $alias;
+    }
+
+}
diff --git a/frontend/views/catalog/categories.php b/frontend/views/catalog/categories.php
new file mode 100644
index 0000000..84406f7
--- /dev/null
+++ b/frontend/views/catalog/categories.php
@@ -0,0 +1,45 @@
+<?php
+/** @var $this \yii\web\View */
+/** @var $dataProvider \yii\data\ActiveDataProvider */
+
+$this->title = $category->name;
+foreach($category->getParents()->all() as $parent) {
+    $this->params['breadcrumbs'][] = ['label' => $parent->name, 'url' => ['catalog/category', 'alias' => $parent->alias]];
+}
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<h1 class="category_page_main_title"><?= $this->title ?></h1>
+
+<div class="category_wrap">
+
+    <div class="category_wrap_3_colum"><!-- 3 colons for items ==================================  1rst colum -->
+
+        <?php foreach($category->getAllChildrenTree(2) as $category) :?>
+            <div class="wrap">
+                <div class="cat_li_cont">
+                <?php if (!empty($category['item']->image)) :?>
+                    <img src="<?= $category['item']->image?>" alt="<?= $category['item']->name?>">
+                <?php else :?>
+                    <img src="/images/category/1.png" alt="">
+                <?php endif;?>
+                    <div class="desc"><?= $category['item']->name?><!-- (133)--></div>
+                <?php if(!empty($category['children'])) :?>
+                    <span class="arrow"></span>
+                <?php endif?>
+                </div>
+                <?php if(!empty($category['children'])) :?>
+                <div class="cat_li_sub_ul">
+                    <ul>
+                    <?php foreach($category['children'] as $_category) :?>
+                        <li><a href="<?= \yii\helpers\Url::to(['catalog/category', 'alias' => $_category['item']->alias])?>"><?= $_category['item']->name?><!-- (18)--></a></li>
+                    <?php endforeach?>
+                    </ul>
+                </div>
+                <?php endif?>
+            </div>
+            <!--    $this->params['breadcrumbs'][] = ['label' => $parent->name, 'url' => ['catalog/category', 'alias' => $parent->alias]];-->
+        <?php endforeach?>
+
+    </div><!-- end of 3 colons for items -->
+
+</div>
\ No newline at end of file
--
libgit2 0.21.4