From 82f961f9035a4f8368c6c3f767a38d47072b1026 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 14 Sep 2016 17:47:08 +0300
Subject: [PATCH] big commti

---
 backend/controllers/ArticlesController.php       |  26 ++------------------------
 backend/controllers/SliderImageController.php    |  32 ++------------------------------
 backend/views/banner/_form.php                   |  40 ++++++++++++++++++++--------------------
 backend/views/bg/_form.php                       |  21 +++++++++++++++++++--
 backend/views/brand/_form.php                    |   2 ++
 backend/views/brand/index.php                    |   7 ++++---
 backend/views/customer/_form.php                 |   5 +----
 backend/views/customer/index.php                 |   1 -
 backend/views/slider-image/_form.php             |   1 +
 common/behaviors/SaveImgBehavior.php             |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/models/Articles.php                       |  16 +++++++---------
 common/models/Banner.php                         |  16 ++++++++++++++++
 common/models/Basket.php                         |  14 +++++++-------
 common/models/Bg.php                             |  17 ++++++++++++++++-
 common/models/Customer.php                       |  24 ------------------------
 common/models/CustomerSearch.php                 |  10 ++++++----
 common/models/SliderImage.php                    |  26 ++++++++++++++++++++------
 common/modules/comment/widgets/CommentWidget.php |   6 +++---
 common/modules/product/models/Brand.php          |   2 ++
 frontend/views/catalog/brand.php                 | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/views/partial/brand_list.php            |  16 ++++++++++++++++
 frontend/views/partial/main-menu.php             |  54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 22 files changed, 522 insertions(+), 138 deletions(-)
 create mode 100644 common/behaviors/SaveImgBehavior.php
 create mode 100644 frontend/views/catalog/brand.php
 create mode 100644 frontend/views/partial/brand_list.php
 create mode 100644 frontend/views/partial/main-menu.php

diff --git a/backend/controllers/ArticlesController.php b/backend/controllers/ArticlesController.php
index f2ef542..270a8e9 100755
--- a/backend/controllers/ArticlesController.php
+++ b/backend/controllers/ArticlesController.php
@@ -81,18 +81,7 @@ class ArticlesController extends Controller
 
         if ($model->load(Yii::$app->request->post())) {
 
-            if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
-                $model->image = $image->name;
-            }
-
-            $imgDir = Yii::getAlias('@storage/articles/');
-
-            if(!is_dir($imgDir)) {
-                mkdir($imgDir, 0755, true);
-            }
-            if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name));
-            }
+            $model->save();
 
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
@@ -113,18 +102,7 @@ class ArticlesController extends Controller
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post())) {
-            if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
-                $model->image = $image->name;
-            }
-
-            $imgDir = Yii::getAlias('@storage/articles/');
-
-            if(!is_dir($imgDir)) {
-                mkdir($imgDir, 0755, true);
-            }
-            if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name));
-            }
+            $model->save();
 
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
diff --git a/backend/controllers/SliderImageController.php b/backend/controllers/SliderImageController.php
index a0009cd..b055c0d 100755
--- a/backend/controllers/SliderImageController.php
+++ b/backend/controllers/SliderImageController.php
@@ -85,19 +85,7 @@ class SliderImageController extends Controller
 
         if ($model->load(Yii::$app->request->post())) {
             $model->slider_id = $slider_id;
-            if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
-                $model->image = $image->name;
-            }
-            if ($model->save() && $image) {
-
-                $imgDir = Yii::getAlias('@storage/slider/');
-
-                if(!is_dir($imgDir)) {
-                    mkdir($imgDir, 0755, true);
-                }
-
-                $image->saveAs(Yii::getAlias('@storage/slider/' . $image->name));
-            }
+            $model->save();
             return $this->redirect(['view', 'slider_id'=>$slider_id, 'id' => $model->slider_image_id]);
         } else {
 
@@ -126,23 +114,7 @@ class SliderImageController extends Controller
 
 
 
-            if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
-                $model->image = $image->name;
-            }
-
-            if(!$model->image){
-                $model->image = $model->getOldAttribute('image');
-            }
-
-            if ($model->save() && $image) {
-                $imgDir = Yii::getAlias('@storage/slider/');
-
-                if(!is_dir($imgDir)) {
-                    mkdir($imgDir, 0755, true);
-                }
-
-                $image->saveAs(Yii::getAlias('@storage/slider/' . $image->name));
-            }
+            $model->save();
             return $this->redirect(['view', 'slider_id'=>$slider_id, 'id' => $model->slider_image_id]);
         } else {
 
diff --git a/backend/views/banner/_form.php b/backend/views/banner/_form.php
index 0c8868a..ea230cb 100755
--- a/backend/views/banner/_form.php
+++ b/backend/views/banner/_form.php
@@ -12,7 +12,10 @@ use yii\widgets\ActiveForm;
 
 <div class="banner-form">
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
 
 
     <?= $form->field($model, 'alt')->textInput(['maxlength' => true]) ?>
@@ -31,27 +34,24 @@ use yii\widgets\ActiveForm;
         ]
     ])) ?>
 
-    <?= $form->field($model, 'width')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'height')->textInput(['maxlength' => true]) ?>
-
-    <p id="save_image_widget_settings" class = "btn btn-primary" >Применить настройки</p>
 
     <div id="image_widget_block">
-        <?php if(!empty($model->image)){
-            echo ImageUploader::widget([
-                'model'=> $model,
-                'field'=>'image',
-                'size' => [
-                    [
-                        'width'=>$model->width,
-                        'height'=>$model->height,
-                    ],
-                ],
-                'gallery' =>$model->image,
-                'name' => "Загрузить баннер"
-            ]);
-        }?>
+
+        <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
+            'language' => 'ru',
+            'options' => [
+                'accept' => 'image/*',
+                'multiple' => false,
+            ],
+            'pluginOptions' => [
+                'allowedFileExtensions' => ['jpg', 'gif', 'png'],
+                'initialPreview' => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '',
+                'overwriteInitial' => true,
+                'showRemove' => false,
+                'showUpload' => false,
+                'previewFileType' => 'image',
+            ],
+        ]); ?>
     </div>
 
     <div class="form-group">
diff --git a/backend/views/bg/_form.php b/backend/views/bg/_form.php
index 30dd166..4cf97c5 100755
--- a/backend/views/bg/_form.php
+++ b/backend/views/bg/_form.php
@@ -10,13 +10,30 @@ use yii\widgets\ActiveForm;
 
 <div class="bg-form">
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
 
     <?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'url')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'image')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
+        'language' => 'ru',
+        'options' => [
+            'accept' => 'image/*',
+            'multiple' => false,
+        ],
+        'pluginOptions' => [
+            'allowedFileExtensions' => ['jpg', 'gif', 'png'],
+            'initialPreview' => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '',
+            'overwriteInitial' => true,
+            'showRemove' => false,
+            'showUpload' => false,
+            'previewFileType' => 'image',
+        ],
+    ]); ?>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/backend/views/brand/_form.php b/backend/views/brand/_form.php
index 6ae3467..7c4530d 100755
--- a/backend/views/brand/_form.php
+++ b/backend/views/brand/_form.php
@@ -43,6 +43,8 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
 
+    <?= $form->field($model, 'in_menu')->checkbox()?>
+
     <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) :?>
diff --git a/backend/views/brand/index.php b/backend/views/brand/index.php
index d1295f1..ad78276 100755
--- a/backend/views/brand/index.php
+++ b/backend/views/brand/index.php
@@ -1,5 +1,6 @@
 <?php
 
+use common\components\artboximage\ArtboxImageHelper;
 use yii\helpers\Html;
 use yii\grid\GridView;
 
@@ -27,10 +28,10 @@ $this->params['breadcrumbs'][] = $this->title;
             'name',
             'alias',
             [
-                'attribute' => 'title',
-                'format' => 'html',
+                'attribute' => 'image',
+                'format' => 'image',
                 'value' => function($data) {
-                    return Html::img($data->imageUrl, ['width'=>'100']);
+                    return ArtboxImageHelper::getImageSrc($data->imageUrl, 'brand_item');
                 },
             ],
 
diff --git a/backend/views/customer/_form.php b/backend/views/customer/_form.php
index 01f70af..1170648 100755
--- a/backend/views/customer/_form.php
+++ b/backend/views/customer/_form.php
@@ -12,11 +12,10 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'id')->textInput() ?>
 
     <?= $form->field($model, 'username')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
+
 
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
@@ -26,8 +25,6 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'date_time')->textInput() ?>
 
-    <?= $form->field($model, 'sex')->textInput(['maxlength' => true]) ?>
-
     <?= $form->field($model, 'birth_day')->textInput() ?>
 
     <?= $form->field($model, 'birth_month')->textInput() ?>
diff --git a/backend/views/customer/index.php b/backend/views/customer/index.php
index b7e25bf..40909ae 100755
--- a/backend/views/customer/index.php
+++ b/backend/views/customer/index.php
@@ -26,7 +26,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
             'id',
             'username',
-            'password',
             'name',
             'surname',
             // 'phone',
diff --git a/backend/views/slider-image/_form.php b/backend/views/slider-image/_form.php
index 52b2954..01f72be 100755
--- a/backend/views/slider-image/_form.php
+++ b/backend/views/slider-image/_form.php
@@ -16,6 +16,7 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
 
+
     <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
         'model' => $model,
         'attribute' => 'image',
diff --git a/common/behaviors/SaveImgBehavior.php b/common/behaviors/SaveImgBehavior.php
new file mode 100644
index 0000000..2c16501
--- /dev/null
+++ b/common/behaviors/SaveImgBehavior.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace common\behaviors;
+
+use common\modules\comment\models\CommentModel;
+use yii\base\Behavior;
+use yii\db\ActiveRecord;
+use yii\web\UploadedFile;
+/**
+ * Class RatingBehavior
+ * @property CommentModel $owner
+ * @package common\behaviors
+ */
+class SaveImgBehavior extends Behavior
+{
+
+
+    public $directory;
+
+    public function events()
+    {
+        return [
+            ActiveRecord::EVENT_BEFORE_UPDATE => 'beforeUpdate',
+            ActiveRecord::EVENT_BEFORE_INSERT => 'beforeInsert',
+        ];
+    }
+
+    public function beforeUpdate($event)
+    {
+
+
+        if ( ($image = UploadedFile::getInstance($this->owner, 'image')) ) {
+            $this->owner->image = $image->name;
+        }
+
+        if(!$this->owner->image){
+            $this->owner->image = $this->owner->getOldAttribute('image');
+        }
+
+
+        if ($image) {
+            $imgDir = \Yii::getAlias('@storage/'.$this->directory.'/');
+
+            if(!is_dir($imgDir)) {
+                mkdir($imgDir, 0755, true);
+            }
+
+            $image->saveAs(\Yii::getAlias('@storage/'.$this->directory.'/' . $image->name));
+        }
+    }
+
+
+    public function beforeInsert($event)
+    {
+
+
+        if ( ($image = UploadedFile::getInstance($this->owner, 'image')) ) {
+            $this->owner->image = $image->name;
+        }
+
+
+
+        if ($image) {
+            $imgDir = \Yii::getAlias('@storage/'.$this->directory.'/');
+
+            if(!is_dir($imgDir)) {
+                mkdir($imgDir, 0755, true);
+            }
+
+            $image->saveAs(\Yii::getAlias('@storage/'.$this->directory.'/' . $image->name));
+        }
+    }
+
+
+
+    public function getImageFile() {
+        return empty($this->owner->image) ? null : '/storage/'.$this->directory.'/'. $this->owner->image;
+    }
+
+    public function getImageUrl() {
+        return empty($this->owner->image) ? null : '/storage/'.$this->directory.'/'. $this->owner->image;
+    }
+}
\ No newline at end of file
diff --git a/common/models/Articles.php b/common/models/Articles.php
index 06b7ac8..bc99142 100755
--- a/common/models/Articles.php
+++ b/common/models/Articles.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use common\behaviors\RatingBehavior;
+use common\behaviors\SaveImgBehavior;
 use common\modules\comment\models\CommentModel;
 use Yii;
 
@@ -33,12 +34,18 @@ class Articles extends \yii\db\ActiveRecord
         return 'articles';
     }
 
+
+
     /**
      * @inheritdoc
      */
     public function behaviors()
     {
         return [
+            [
+                'class'     => SaveImgBehavior::className(),
+                'directory' => 'articles'
+            ],
             'slug' => [
                 'class' => 'common\behaviors\Slug',
                 'in_attribute' => 'title',
@@ -84,15 +91,6 @@ class Articles extends \yii\db\ActiveRecord
         ];
     }
 
-    public function getImageFile() {
-        return empty($this->image) ? null : Yii::getAlias('@imagesDir/articles/'. $this->image);
-    }
-
-    public function getImageUrl()
-    {
-        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/articles/' . $this->image);
-    }
-    
     public function recalculateRating() {
         /**
          * @var ArticleToRating $averageRating
diff --git a/common/models/Banner.php b/common/models/Banner.php
index 4638770..da6de11 100755
--- a/common/models/Banner.php
+++ b/common/models/Banner.php
@@ -2,6 +2,7 @@
 
 namespace common\models;
 
+use common\behaviors\SaveImgBehavior;
 use Yii;
 
 /**
@@ -26,6 +27,21 @@ class Banner extends \yii\db\ActiveRecord
         return 'banner';
     }
 
+
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            [
+                'class'     => SaveImgBehavior::className(),
+                'directory' => 'banner'
+            ],
+        ];
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/common/models/Basket.php b/common/models/Basket.php
index 9ff63ac..3330951 100755
--- a/common/models/Basket.php
+++ b/common/models/Basket.php
@@ -20,7 +20,7 @@
             parent::__construct($config);
         }
         
-        public function add( $product_variant_id,  $count)
+        public function add(int $product_variant_id, int $count)
         {
             $data = $this->getData();
             if(array_key_exists($product_variant_id, $data)) {
@@ -38,7 +38,7 @@
             $this->setData($data);
         }
     
-        public function set( $product_variant_id,  $count)
+        public function set(int $product_variant_id, int $count)
         {
             $data = $this->getData();
             if(array_key_exists($product_variant_id, $data)) {
@@ -56,12 +56,12 @@
             $this->setData($data);
         }
         
-        public function getData()
+        public function getData(): array
         {
             return $this->session->get('basket');
         }
         
-        public function getItem( $product_variant_id) {
+        public function getItem(int $product_variant_id) {
             $data = $this->getData();
             if(!empty($data[$product_variant_id])) {
                 return $data[$product_variant_id];
@@ -75,7 +75,7 @@
             $this->session->set('basket', $data);
         }
         
-        public function getSum()
+        public function getSum(): float
         {
             $data = $this->getData();
             $sum = 0;
@@ -85,12 +85,12 @@
             return $sum;
         }
         
-        public function getCount() {
+        public function getCount(): int {
             $data = $this->getData();
             return count($data);
         }
         
-        public function findModel( $product_variant_id)
+        public function findModel(int $product_variant_id): ProductVariant
         {
             $model = ProductVariant::find()
                                    ->where([ 'product_variant_id' => $product_variant_id ])
diff --git a/common/models/Bg.php b/common/models/Bg.php
index aabd040..405ad39 100755
--- a/common/models/Bg.php
+++ b/common/models/Bg.php
@@ -2,6 +2,8 @@
 
 namespace common\models;
 
+use common\behaviors\SaveImgBehavior;
+
 class Bg extends \yii\db\ActiveRecord
 {
 	public $old_image;
@@ -10,7 +12,20 @@ class Bg extends \yii\db\ActiveRecord
     {
         return 'bg';
     }
-	
+
+	/**
+	 * @inheritdoc
+	 */
+	public function behaviors()
+	{
+		return [
+			[
+				'class'     => SaveImgBehavior::className(),
+				'directory' => 'bg'
+			],
+		];
+	}
+
 	public function rules()
 	{
 		return [
diff --git a/common/models/Customer.php b/common/models/Customer.php
index 8cb51e4..d64fd12 100644
--- a/common/models/Customer.php
+++ b/common/models/Customer.php
@@ -88,30 +88,6 @@ class Customer extends User implements \yii\web\IdentityInterface
     /**
      * @return \yii\db\ActiveQuery
      */
-    public function getArtboxComments()
-    {
-        return $this->hasMany(ArtboxComment::className(), ['user_id' => 'id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getArtboxCommentRatings()
-    {
-        return $this->hasMany(ArtboxCommentRating::className(), ['user_id' => 'id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getArtboxLikes()
-    {
-        return $this->hasMany(ArtboxLike::className(), ['user_id' => 'id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
     public function getShares()
     {
         return $this->hasMany(Share::className(), ['user_id' => 'id']);
diff --git a/common/models/CustomerSearch.php b/common/models/CustomerSearch.php
index 9cd6feb..ab3b5d2 100755
--- a/common/models/CustomerSearch.php
+++ b/common/models/CustomerSearch.php
@@ -18,8 +18,12 @@ class CustomerSearch extends Customer
     public function rules()
     {
         return [
-            [['id', 'birth_day', 'birth_month', 'birth_year', 'group_id'], 'integer'],
-            [['username', 'password', 'name', 'surname', 'phone', 'date_time', 'sex', 'body'], 'safe'],
+            [['date_time'], 'safe'],
+            [['birth_day', 'birth_month', 'birth_year', 'group_id', 'status', 'created_at', 'updated_at'], 'integer'],
+            [['body'], 'string'],
+            [['status'],'default', 'value' => '10'],
+            [['username', 'name', 'surname', 'phone', 'email', 'password_reset_token','username', 'password_hash'], 'string', 'max' => 255],
+            [['gender', 'auth_key'], 'string', 'max' => 32],
         ];
     }
 
@@ -68,11 +72,9 @@ class CustomerSearch extends Customer
         ]);
 
         $query->andFilterWhere(['like', 'username', $this->username])
-            ->andFilterWhere(['like', 'password', $this->password])
             ->andFilterWhere(['like', 'name', $this->name])
             ->andFilterWhere(['like', 'surname', $this->surname])
             ->andFilterWhere(['like', 'phone', $this->phone])
-            ->andFilterWhere(['like', 'sex', $this->sex])
             ->andFilterWhere(['like', 'body', $this->body]);
 
         return $dataProvider;
diff --git a/common/models/SliderImage.php b/common/models/SliderImage.php
index b24fa3c..e54c941 100755
--- a/common/models/SliderImage.php
+++ b/common/models/SliderImage.php
@@ -2,6 +2,7 @@
 
 namespace common\models;
 
+use common\behaviors\SaveImgBehavior;
 use Yii;
 
 /**
@@ -20,6 +21,23 @@ use Yii;
  */
 class SliderImage extends \yii\db\ActiveRecord
 {
+
+
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            [
+                'class'     => SaveImgBehavior::className(),
+                'directory' => 'slider'
+            ]
+        ];
+    }
+
+
     /**
      * @inheritdoc
      */
@@ -57,6 +75,8 @@ class SliderImage extends \yii\db\ActiveRecord
         ];
     }
 
+
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -65,12 +85,6 @@ class SliderImage extends \yii\db\ActiveRecord
         return $this->hasOne(Slider::className(), ['slider_id' => 'slider_id']);
     }
 
-    public function getImageFile() {
-        return empty($this->image) ? null : '/storage/slider/'. $this->image;
-    }
 
-    public function getImageUrl() {
-        return empty($this->image) ? null : '/storage/slider/'. $this->image;
-    }
 
 }
diff --git a/common/modules/comment/widgets/CommentWidget.php b/common/modules/comment/widgets/CommentWidget.php
index c6f643a..797b705 100755
--- a/common/modules/comment/widgets/CommentWidget.php
+++ b/common/modules/comment/widgets/CommentWidget.php
@@ -270,7 +270,7 @@
          * @return CommentInterface Comment model
          * @throws InvalidConfigException If object not instance of \yii\base\Model
          */
-        protected function createModel( $className,  $config = [ ])
+        protected function createModel(string $className, array $config = [ ]): CommentInterface
         {
             $options = array_merge($config, [ 'class' => $className ]);
             $object = Yii::createObject($options);
@@ -289,7 +289,7 @@
          * @return CommentInterface Comment model
          * @throws InvalidConfigException If object not instance of \yii\base\Model
          */
-        protected function createRating( $className,  $config = [ ])
+        protected function createRating(string $className, array $config = [ ]): RatingModel
         {
             $options = array_merge($config, [ 'class' => $className ]);
             $object = Yii::createObject($options);
@@ -340,7 +340,7 @@
         /**
          * @return string
          */
-        protected function renderWidget()
+        protected function renderWidget(): string
         {
             $layout = $this->layout;
             $parts = $this->parts;
diff --git a/common/modules/product/models/Brand.php b/common/modules/product/models/Brand.php
index f519631..4ccfba4 100755
--- a/common/modules/product/models/Brand.php
+++ b/common/modules/product/models/Brand.php
@@ -60,6 +60,7 @@ class Brand extends \yii\db\ActiveRecord
         return [
             [['name'], 'string'],
             [['brand_name_id'], 'integer'],
+            [['in_menu'], 'boolean'],
             [['meta_desc', 'seo_text'], 'string'],
             [['alias', 'name'], 'string', 'max' => 250],
             [['meta_title', 'image'], 'string', 'max' => 255],
@@ -85,6 +86,7 @@ class Brand extends \yii\db\ActiveRecord
             'meta_desc' => Yii::t('product', 'Meta Desc'),
             'meta_robots' => Yii::t('product', 'Meta Robots'),
             'seo_text' => Yii::t('product', 'Seo Text'),
+            'in_menu' => Yii::t('product', 'Выводить в меню'),
         ];
     }
 
diff --git a/frontend/views/catalog/brand.php b/frontend/views/catalog/brand.php
new file mode 100644
index 0000000..c1bfd61
--- /dev/null
+++ b/frontend/views/catalog/brand.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * @var $productProvider \yii\data\ActiveDataProvider
+ * @var View $this
+ */
+use frontend\widgets\FilterWidget;
+use frontend\widgets\Seo;
+use yii\helpers\Url;
+use yii\web\View;
+use yii\widgets\ListView;
+$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : '';
+
+$this->params['seo']['fields']['meta-title'] = $category->meta_title;
+$this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
+$this->params['seo']['seo_text'] = $category->seo_text;
+$this->params['seo']['description'] = $category->meta_desc;
+$this->params['seo']['meta'] = $category->meta_robots;
+$this->params['seo']['category_name'] = $category->name;
+
+$this->params['breadcrumbs'][] = $category->name;
+?>
+<!-- Табы для слайдера -->
+<div class="bigSlidertabs fixed"  style="position:fixed;">
+    <div class="block-100">
+        <div class="tab1">
+            <a href="actionlist.htm">
+                <div class="tab_bg_1"></div>
+                <p>В данный момент у нас проходит <a href="actionlist.htm">25 акций</p></a>
+            </a>
+        </div>
+        <!--
+    <div class="tab2" style="display: none;">
+        <div class="tab_bg_2"></div>
+        <p>Поступило на продажу <a href="#">10 новинок</a></p>
+    </div>
+    -->
+    </div>
+</div>
+<div class="container">
+    <div class="block-25" style="position: relative;">
+
+
+
+        <div class="columnLeftInfo">
+            <!-- del_columnLeftInfo -->
+
+
+
+
+
+            <a href="http://ventolux.ua/"><img src="http://www.linija-svitla.ua/res/custom/images/banner/ventolux1.jpg"></a><br><br>
+
+
+            <table border="0" cellspacing="0" cellpadding="0" class="boxGen articleBox">
+                <tr class="bxhead">
+                    <th class="bxhl"></th>
+                    <th class="bxhc"><div class="h3">
+                            <a href="view-articles/">Статьи</a>
+                        </div></th>
+
+                    <th class="bxhr"></th>
+                </tr>
+
+                <tr class="bxdelim">
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                <tr class="bxmiddle">
+                    <td class="bxl"></td>
+                    <td class="bxc">                    <div width="100%" class="articlesBox"><!-- cats_table-->
+                            <div width="100%">
+                                <div class="articleItem">
+                        <span class="image">
+                                                        </span>
+                        <span align="left" class="title">
+                            <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm" >
+                                Линия света представила трендовые модели на Interior Mebel
+                            </a>
+                        </span>
+
+                                    <div align="left" class="desc">
+                                        <p>В Киеве прошла выставка Interior Mebel, которая уже традиционно собирает лучшие образцы дизайна интерьера. На...
+                                            <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm" >
+                                                подробнее
+                                            </a>
+                                    </div>
+
+                                </div>
+
+
+                                <div class="articleItem">
+                        <span class="image">
+                                                        </span>
+                        <span align="left" class="title">
+                            <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm" >
+                                Светодиодное освещение Light Topps | Светодиодные...
+                            </a>
+                        </span>
+
+                                    <div align="left" class="desc">
+                                        О светодиодных лампах и светильниках, в которых используются светодиодные модули, написано немало и наверняка уже...
+                                        <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm" >
+                                            подробнее
+                                        </a>
+                                    </div>
+
+                                </div>
+
+
+                                <div class="articleItem">
+                        <span class="image">
+                                                        </span>
+                        <span align="left" class="title">
+                            <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm" >
+                                Люстры потолочные. Новые возможности управления светом
+                            </a>
+                        </span>
+
+                                    <div align="left" class="desc">
+                                        Люстры потолочные оснащенные пультом дистанционного управления, позволяют включать/выключать, а также регулировать...
+                                        <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm" >
+                                            подробнее
+                                        </a>
+                                    </div>
+
+                                </div>
+
+
+
+
+
+
+
+
+
+
+                                <div style="clear: left;"></div>
+
+
+                            </div>
+
+
+                    </td>
+                    <td class="bxr"></td>
+                </tr>
+                <tr class="bxbottom">
+                    <td class="bxbl"></td>
+                    <td class="bxbc"></td>
+                    <td class="bxbr"></td>
+                </tr>
+            </table>
+
+            <div class="clearfix"></div>
+
+
+            <!-- del_columnLeftInfo_end -->
+        </div>
+
+
+        <br />
+
+
+
+    </div>
+    <div class="block-75" itemscope itemtype="http://schema.org/Product">
+
+
+
+
+        <script>
+
+
+        </script>
+
+
+
+        <h1 class="title"><?= Seo::widget([ 'row'=>'h1'])?></h1>
+
+
+        <div class="list_filters_links">
+            <div class="sort_block">
+                <span>Сортировка:</span>
+                <?= \yii\widgets\LinkSorter::widget([
+                    'sort' => $productProvider->sort,
+                    'attributes' => [
+                        'price',
+                    ]
+                ]);
+                ?>
+            </div>
+            <div class="clearfix"></div>
+        </div>
+
+
+
+        <div class="clearfix"></div>
+
+
+        <div class="catalog_product_list view_table">
+
+
+            <?= ListView::widget([
+                'dataProvider' => $productProvider,
+                'itemView' => function ($model, $key, $index, $widget) use($category) {
+                    return $this->render('_product_item',[
+                        'model' => $model,
+                        'category' => $category
+                    ]);
+                },
+                'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
+            ])
+
+            ?>
+
+
+
+
+            <div class="clearfix"></div>
+        </div>
+
+        <br>
+
+
+
+
+
+
+
+        <div class="clearfix"></div>
+
+
+
+
+        <div class="clearfix"></div>
+
+
+    </div>
+</div>
+
+
diff --git a/frontend/views/partial/brand_list.php b/frontend/views/partial/brand_list.php
new file mode 100644
index 0000000..de29663
--- /dev/null
+++ b/frontend/views/partial/brand_list.php
@@ -0,0 +1,16 @@
+<?php
+use common\modules\product\models\Brand;
+use yii\helpers\Html;
+use common\components\artboximage\ArtboxImageHelper;
+
+$brands = Brand::find()->where(['in_menu' => 1])->all();
+$content = '';
+
+foreach($brands as $brand){
+    $content .= Html::tag('li', Html::a(Html::img(ArtboxImageHelper::getImageSrc($brand->imageUrl, 'brand_item')),\yii\helpers\Url::to(['catalog/brand', 'brand' => $brand->alias]) ));
+
+}
+
+
+echo Html::tag('ul',$content);
+
diff --git a/frontend/views/partial/main-menu.php b/frontend/views/partial/main-menu.php
new file mode 100644
index 0000000..bdf363f
--- /dev/null
+++ b/frontend/views/partial/main-menu.php
@@ -0,0 +1,54 @@
+<?php
+use common\components\artboximage\ArtboxImageHelper;
+use common\modules\product\models\Category;
+use yii\helpers\Html;
+use yii\helpers\Url;
+
+$models = Category::find()->all();
+?>
+
+
+<div id="mainmenu">
+    <div class="container">
+        <ul id="menu-bar">
+
+
+        <?php foreach($models as $model):?>
+            <li>
+
+
+                <a href="<?= Url::to(['catalog/category','category' => $model['alias']]) ?>">
+                    <?= $model->name?>
+                    <div class="main_menu_divider"></div>
+                    <div class="main_menu_down_arrow"></div>
+                </a>
+
+
+                <ul>
+
+                <?php foreach($model->getTaxGroupsForMenu() as $group): ?>
+                    <li>
+
+                        <a href="<?= Url::to(['catalog/category','category' => $model['alias'],'filters' => [$group['alias'] => [$group['option_alias']]]]) ?>">
+                            <div class="option_image_block">
+                                <?= Html::img(ArtboxImageHelper::getImageSrc(Yii::getAlias('@imagesUrl/tax_option/'. $group['image']), 'option_menu'))?>
+                            </div>
+                            <div class="clearfix"></div>
+                            <span class="menu-bar-cat-name"><?=$group['value']?></span>
+                        </a>
+                    </li>
+                <?php endforeach;?>
+
+
+                </ul>
+
+            </li>
+        <?php endforeach; ?>
+
+
+
+
+
+        </ul>
+    </div>
+</div>
\ No newline at end of file
--
libgit2 0.21.4