-

Karnovsky A
1 parent 1772b984
Showing 32 changed files with 432 additions and 190 deletions Show diff stats
backend/views/slider-image/_form.php
backend/web/css/site.css
common/config/main.php
common/models/Share.php
common/modules/product/controllers/ManageController.php
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/Product.php
common/modules/product/models/ProductImage.php
common/modules/product/models/ProductSearch.php
common/modules/product/models/ProductVariant.php
common/modules/product/views/manage/_form.php
common/modules/product/views/manage/index.php
common/modules/product/widgets/lastProducts.php
common/modules/product/widgets/specialProducts.php
common/modules/product/widgets/views/brandsCarousel.php
common/modules/product/widgets/views/product_smart.php
common/modules/product/widgets/views/products_block.php
common/modules/product/widgets/views/submenu.php
frontend/config/main.php
frontend/controllers/CatalogController.php
@@ -23,7 +23,7 @@ use yii\widgets\ActiveForm;
         ],
         'pluginOptions' => [
             'allowedFileExtensions' => ['jpg','gif','png'],
-            'initialPreview' => $model->imageUrl ? Yii::$app->imageCache->thumb($model->imageUrl, 'slider') : '',
+            'initialPreview' => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
             'overwriteInitial' => true,
             'showRemove' => true,
             'showUpload' => false,
+@import url("//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css");
+
 html,
 body {
     height: 100%;
@@ -75,49 +75,46 @@ return [
                         'height' => 300,
                         'master' => null
                     ],
-                    /*'flip' => [
-                        'direction' => \common\components\artboximage\drivers\Image::HORIZONTAL
-                    ]*/
                 ],
-                'brandlist' => [
+                'product_variant' => [
                     'resize' => [
-                        'width' => 138,
-                        'height' => 78,
+                        'width' => 44,
+                        'height' => 44,
                         'master' => null
                     ],
                 ],
-                'product_trumb' => [
+                'product_trumb2' => [
                     'resize' => [
-                        'width' => 80,
-                        'height' => 80,
+                        'width' => 100,
+                        'height' => 100,
                         'master' => null
                     ],
                 ],
-                'product_variant' => [
+                'slider' => [
                     'resize' => [
-                        'width' => 44,
-                        'height' => 44,
+                        'width' => 720,
+                        'height' => 340,
                         'master' => null
                     ],
                 ],
-                'product_list' => [
+                'brandlist' => [
                     'resize' => [
-                        'width' => 130,
-                        'height' => 70,
+                        'width' => 128,
+                        'height' => 128,
                         'master' => null
                     ],
                 ],
-                'product_list2' => [
+                'mainmenu' => [
                     'resize' => [
-                        'width' => 130,
-                        'height' => 70,
+                        'width' => 160,
+                        'height' => 170,
                         'master' => null
                     ],
                 ],
-                'mainmenu' => [
+                'list' => [
                     'resize' => [
-                        'width' => 160,
-                        'height' => 170,
+                        'width' => 134,
+                        'height' => 200,
                         'master' => null
                     ],
                 ],
+<?php
+
+namespace common\models;
+
+use Yii;
+
+class Share extends \yii\db\ActiveRecord
+{
+    
+    public static function tableName()
+    {
+        return 'share';
+    }
+    
+    public function attributeLabels()
+    {
+        return [
+            'product_name' => 'Название',
+            'date_time'=>'Дата',
+        ];
+    }    
+    
+	public function beforeSave($insert) {
+            $this->user_id = Yii::$app->user->id;
+            $this->date_time = time();
+            $this->date = new \yii\db\Expression('NOW()');
+            return parent::beforeSave($insert);
+	}
+        
+        public function beforeDelete() {
+            return parent::beforeDelete();
+        } 
+        
+        public function getProduct()
+        { 
+          return $this->hasOne(Products::className(), ['id' => 'product_id']);
+        }
+
+        public function getShareList()
+        {
+            return $this->hasMany(self::className(), ['date' => 'date'])->where(['user_id'=>Yii::$app->user->id])->orderBy('id DESC');
+        }
+    
+}    
@@ -127,7 +127,7 @@ class ManageController extends Controller
         if ($model->load(Yii::$app->request->post())) {
             $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
-            if ($model->save()) {
+            if ($model->save() && $model->imagesUpload) {
                 foreach ($model->images as $image) {
                     $image->delete();
                 }
@@ -214,6 +214,36 @@ class ManageController extends Controller
         exit;
     }
+    public function actionIs_top($id) {
+        $model = $this->findModel($id);
+
+        $model->is_top = intval(empty($model->is_top));
+
+        $model->save(false, ['is_top']);
+
+        return $this->redirect(['index']);
+    }
+
+    public function actionIs_new($id) {
+        $model = $this->findModel($id);
+
+        $model->is_new = intval(empty($model->is_new));
+
+        $model->save(false, ['is_new']);
+
+        return $this->redirect(['index']);
+    }
+
+    public function actionAkciya($id) {
+        $model = $this->findModel($id);
+
+        $model->akciya = intval(empty($model->akciya));
+
+        $model->save(false, ['akciya']);
+
+        return $this->redirect(['index']);
+    }
+
     public function actionImport() {
         $searchModel = new RemoteProductsSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -69,8 +69,23 @@ class ProductHelper extends Object {
     public static function getLastProducts($as_object = false) {
         $last_products = Yii::$app->session->get('last_products', []);
         if ($as_object) {
-            $last_products = Product::find()->where(['product_id' => $last_products])->all();
+            $last_products = array_reverse(Product::find()->where(['product_id' => $last_products])->all());
         }
         return $last_products;
     }
+
+    public static function getSpecialProducts($type, $count, $sort = null) {
+        switch($type) {
+            case 'top':
+                $data = ['is_top' => true];
+                break;
+            case 'new':
+                $data = ['is_new' => true];
+                break;
+            case 'promo':
+                $data = ['akciya' => true];
+                break;
+        }
+        return Product::find()->where($data)->limit($count)/*->orderBy($sort)*/->all();
+    }
 }
 \ No newline at end of file
@@ -24,6 +24,7 @@ use yii\web\UploadedFile;
  * @property array $images
  * @property boolean $is_top
  * @property boolean $is_new
+ * @property boolean $akciya
  */
 class Product extends \yii\db\ActiveRecord
 {
@@ -72,9 +73,9 @@ class Product extends \yii\db\ActiveRecord
             [['name'], 'string', 'max' => 150],
             [['alias'], 'string', 'max' => 250],
             [['categories', 'variants', 'options', 'imagesUpload'], 'safe'],
-            [['imagesUpload'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif', 'maxFiles' => 50],
+//            [['imagesUpload'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif', 'maxFiles' => 50],
             [['description', 'video'], 'safe'],
-            [['is_top', 'is_new'], 'boolean'],
+            [['is_top', 'is_new', 'akciya'], 'boolean'],
 //            [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
         ];
     }
@@ -97,6 +98,7 @@ class Product extends \yii\db\ActiveRecord
             'variants' => Yii::t('product', 'Variants'),
             'is_top' => Yii::t('product', 'Is top'),
             'is_new' => Yii::t('product', 'Is new'),
+            'akciya' => Yii::t('product', 'Is promo'),
         ];
     }
@@ -117,6 +119,16 @@ class Product extends \yii\db\ActiveRecord
     }
     /**
+     * fetch stored image url
+     * @return string
+     */
+    public function getImageUrl()
+    {
+        // return a default image placeholder if your source image is not found
+        return !empty($this->image) ? $this->image->imageUrl : '/images/no_photo.png';
+    }
+
+    /**
      * @return \yii\db\ActiveQuery
      */
     public function getImages()
@@ -200,7 +212,7 @@ class Product extends \yii\db\ActiveRecord
 //
 //        }
-        $todel = [];
+        /*$todel = [];
         foreach ($this->variants ? : [] as $_variant) {
             $todel[$_variant->product_variant_id] = $_variant->product_variant_id;
         }
@@ -220,7 +232,7 @@ class Product extends \yii\db\ActiveRecord
         }
         if (!empty($todel)) {
             ProductVariant::deleteAll(['product_variant_id' => $todel]);
-        }
+        }*/
     }
     public function imagesUpload()
@@ -107,7 +107,7 @@ class ProductImage extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         // return a default image placeholder if your source image is not found
-        return isset($this->image) ? '/images/products/'. $this->image : 'default.jpg';
+        return isset($this->image) ? '/images/products/'. $this->image : '/images/no_photo.png';
     }
     /**
@@ -72,18 +72,32 @@ class ProductSearch extends Product
         $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames']);
-        // grid filtering conditions
+        if (isset($this->is_top)) {
+            $query->andFilterWhere([
+                'is_top' => (bool)$this->is_top,
+            ]);
+        }
+        if (isset($this->is_new)) {
+            $query->andFilterWhere([
+                'is_new' => (bool)$this->is_new,
+            ]);
+        }
+        if (isset($this->akciya)) {
+            $query->andFilterWhere([
+                'akciya' => (bool)$this->akciya,
+            ]);
+        }
         $query->andFilterWhere([
             'tax_brand_id' => $this->tax_brand_id,
             'product_id' => $this->product_id,
-            'is_top' => (bool)$this->is_top,
-            'is_new' => (bool)$this->is_new,
         ]);
         $query->andFilterWhere(['ilike', 'name', $this->name]);
         $query->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
         $query->andFilterWhere(['ilike', 'category_name.value', $this->category_name]);
+        $query->orderBy('product.product_id', 'DESC');
+
         return $dataProvider;
     }
@@ -123,6 +123,16 @@ class ProductVariant extends \yii\db\ActiveRecord
     }
     /**
+     * fetch stored image url
+     * @return string
+     */
+    public function getImageUrl()
+    {
+        // return a default image placeholder if your source image is not found
+        return !empty($this->image) ? $this->image->imageUrl : '/images/no_photo.png';
+    }
+
+    /**
      * @return \yii\db\ActiveQuery
      */
     public function getImages()
@@ -23,6 +23,9 @@ use kartik\select2\Select2;
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'is_top')->checkbox() ?>
+    <?= $form->field($model, 'is_new')->checkbox() ?>
+
     <?= $form->field($model, 'description')->widget(\mihaildev\ckeditor\CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
     <?= $form->field($model, 'video')->textarea(); ?>
@@ -40,7 +40,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => '{view} {is_top} {is_new} {update} {delete}',
+                'template' => '{view} |{is_top} {is_new} {akciya}  | {update} {delete}',
                 'buttons' => [
                     'is_top' => function ($url, $model) {
                         return Html::a('<span class="glyphicon glyphicon-star' . ($model->is_top ? '' : '-empty') . '"></span>', $url, [
@@ -52,6 +52,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                             'title' => Yii::t('product', ($model->is_new ? 'Set not is new' : 'Set is new')),
                         ]);
                     },
+                    'akciya' => function ($url, $model) {
+                        return Html::a('<span class="glyphicon glyphicon-tag' . ($model->akciya ? 's' : '') . '"></span>', $url, [
+                            'title' => Yii::t('product', ($model->akciya ? 'Set not is promotion' : 'Set is promotion')),
+                        ]);
+                    },
                 ],
                 'urlCreator' => function ($action, $model, $key, $index) {
                     switch ($action) {
@@ -61,6 +66,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                         case 'is_new':
                             return \yii\helpers\Url::to(['manage/is_new', 'id' => $model->product_id]);
                             break;
+                        case 'akciya':
+                            return \yii\helpers\Url::to(['manage/akciya', 'id' => $model->product_id]);
+                            break;
                         case 'view':
                             return \yii\helpers\Url::to(['/catalog/product', 'id' => $model->product_id, ['target' => '_blank']]);
                             break;
+<?php
+
+namespace common\modules\product\widgets;
+
+use common\modules\product\helpers\ProductHelper;
+use common\modules\product\models\Category;
+use yii\base\Widget;
+
+class lastProducts extends Widget {
+    public function init()
+    {
+        parent::init(); // TODO: Change the autogenerated stub
+    }
+
+    public function run() {
+        return $this->render('products_block', [
+            'title' => \Yii::t('product', 'Вы недавно просматривали'),
+            'products' => ProductHelper::getLastProducts(true),
+        ]);
+    }
+}
 \ No newline at end of file
+<?php
+
+namespace common\modules\product\widgets;
+
+use common\modules\product\helpers\ProductHelper;
+use common\modules\product\models\Category;
+use yii\base\Widget;
+use Yii;
+
+class specialProducts extends Widget {
+    public $type = 'top';
+
+    public $count = 4;
+
+    public $sort = 'default';
+
+    public $title;
+
+    public function init()
+    {
+        parent::init(); // TODO: Change the autogenerated stub
+    }
+
+    public function run() {
+        $products = ProductHelper::getSpecialProducts($this->type, $this->count, $this->sort);
+
+        if (!$this->title) {
+            switch($this->type) {
+                case 'top':
+                    $this->title = Yii::t('product', 'Top products');
+                    break;
+                case 'promo':
+                    $this->title = Yii::t('product', 'Promo products');
+                    break;
+                case 'new':
+                    $this->title = Yii::t('product', 'New products');
+                    break;
+            }
+        }
+
+        return $this->render('products_block', [
+            'title' => $this->title,
+            'products' => $products,
+        ]);
+    }
+}
 \ No newline at end of file
@@ -3,7 +3,7 @@
     <div class="prods_carousel">
         <ul>
             <?php foreach($brands as $brand) :?>
-            <li><span><a href="<?= \yii\helpers\Url::to('/brands/'. $brand->alias)?>" title="<?= $brand->name?>"><?= $brand->imageFile ? Yii::$app->imageCache->thumb($brand->imageFile, 'brandlist') : ''?></a></span></li>
+            <li><span><a href="<?= \yii\helpers\Url::to('/brands/'. $brand->alias)?>" title="<?= $brand->name?>"><?= $brand->imageFile ? \common\components\artboximage\ArtboxImageHelper::getImage($brand->imageFile, 'brandlist') : ''?></a></span></li>
             <?php endforeach?>
         </ul>
     </div>
+<?php
+/** @var \common\modules\product\models\Product $product */
+use yii\helpers\Url;
+?>
+<li class="item">
+    <div class="boxitem">
+        <div class="pixbox">
+            <a href="<?= Url::to([
+                'catalog/product',
+                'product' => $product])
+            ?>">
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
+            </a>
+        </div>
+        <a href="<?= Url::to([
+            'catalog/product',
+            'product' => $product])
+        ?>" class="name"><?= $product->name ?>
+        </a>
+
+        <?php
+
+        echo '<div class="cost-block">';
+
+        // есть скидка
+        if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
+        {
+            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>';
+        }
+
+        echo '<p class="cost">'.$product->variant->price.'  грн.</p>';
+
+        echo '</div>';
+
+        ?>
+    </div>
+    <a href="<?= Url::to([
+        'catalog/product',
+        'product' => $product])
+    ?>" class="link_buy">Купить</a>
+
+    <div class="mycarousel">
+        <ul class="jcarousel jcarousel-skin-tango">
+            <?php foreach ($product->variants as $variant) : ?>
+            <li>
+                <a href="<?= Url::to([
+                    'catalog/product',
+                    'product' => $product,
+                    '#' => 'm' . $variant->product_variant_id]) ?>">
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+                </a>
+            </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+</li>
 \ No newline at end of file
+<hr>
+<div class="products">
+    <h3><?= $title?></h3>
+    <ul>
+        <?php foreach($products as $product) :?>
+            <?= $this->render('product_smart', ['product' => $product]);?>
+        <?php endforeach?>
+    </ul>
+    <div class="both"></div>
+</div>
 \ No newline at end of file
@@ -12,7 +12,7 @@
                                             <?php if (empty($_item->image)) :?>
                                             <img valign="top" src="/images/no_photo.png">
                                             <?php else :?>
-                                                <?= $_item->imageUrl ? Yii::$app->imageCache->thumb($_item->imageUrl, 'mainmenu') : ''?>
+                                                <?= $_item->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item->imageUrl, 'mainmenu') : ''?>
                                             <?php endif?>
                                         </div>
                                         <div class="title"><?= $_item->categoryName->value?></div>
@@ -34,7 +34,7 @@
                                 <?php if (empty($_item['item']->image)) :?>
                                     <img valign="top" src="/images/no_photo.png">
                                 <?php else :?>
-                                    <?= $_item['item']->imageUrl ? Yii::$app->imageCache->thumb($_item['item']->imageUrl, 'mainmenu') : ''?>
+                                    <?= $_item['item']->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item['item']->imageUrl, 'mainmenu') : ''?>
                                 <?php endif?>
                             </div>
                             <div class="title"><?= $_item['item']->categoryName->value?></div>
@@ -38,7 +38,7 @@ return [
         'errorHandler' => [
             'errorAction' => 'site/error',
         ],
-        'imageCache' => [
+        /*'imageCache' => [
             'class' => 'iutbay\yii2imagecache\ImageCache',
             'sourcePath' => '@app/web/images',
             'sourceUrl' => '@web/images',
@@ -56,7 +56,7 @@ return [
                 'mainmenu' => [160, 170],
                 'large' => [600, 600],
             ],
-        ],
+        ],*/
         'urlManager'   => [
             'enablePrettyUrl' => true,
             'showScriptName'  => false,
@@ -42,8 +42,6 @@ class CatalogController extends \yii\web\Controller
             throw new HttpException(404 ,'Page not found');
         }
-        $last_products = ProductHelper::getLastProducts(true);
-
         if (!empty($word)) {
             $params = [];
@@ -73,7 +71,6 @@ class CatalogController extends \yii\web\Controller
                     'category'          => $category,
                     'productModel'      => $productModel,
                     'productProvider'   => $productProvider,
-                    'last_products'     => $last_products,
                     'categories'        => $categories,
                 ]
             );
@@ -145,7 +142,6 @@ class CatalogController extends \yii\web\Controller
                     'optionsProvider'   => $optionsProvider,
                     'groups'            => $groups,
                     'priceLimits'       => $priceLimits,
-                    'last_products'     => $last_products,
                 ]
             );
         }
@@ -169,14 +165,12 @@ class CatalogController extends \yii\web\Controller
         }
         $category = $product->category;
-        $last_products = ProductHelper::getLastProducts(true);
         ProductHelper::addLastProsucts($product->product_id);
         return $this->render('product', [
             'product' => $product,
             'category' => $category,
             'properties' => $groups,
-            'last_products' => $last_products
         ]);
     }
@@ -55,7 +55,9 @@ class ProductFrontendSearch extends Product {
         $query->joinWith('brand');
         $query->joinWith('image');
         $query->joinWith('categories');
-        $query->groupBy('product.product_id');
+        if (empty($_GET['sort']) || ($_GET['sort'] != 'price' && $_GET['sort'] != '-price')) {
+            $query->groupBy('product.product_id');
+        }
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
@@ -102,10 +102,11 @@ $this-&gt;registerJs (&quot;
                        data-cost="<?= $variant->price ?>"
                        data-old_cost="<?= $variant->price_old ?>" data-id="<?= $variant->product_variant_id ?>" data-art="<?= $variant->sku ?>"
                        data-color="<?= $variant->name ?>"
-                       data-image="<?= $variant->image->imageUrl ?>"
-                       data-imageoriginal="<?= $variant->image->imageUrl ?>"
+                       data-image="<?= $variant->imageUrl ?>"
+                       data-imageoriginal="<?= $variant->imageUrl ?>"
                        title="<?= $product->name ?>">
-                        <?= Yii::$app->imageCache->thumb($variant->image->imageUrl, 'product_variant')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
+
                     </a>
                 </li>
             <?php endforeach; ?>
@@ -157,13 +158,13 @@ $this-&gt;registerJs (&quot;
     <div class="content">
         <div class="pic">
             <center>
-                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= Yii::$app->imageCache->thumb($product->image->imageUrl, 'product')?></a>
+                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product')?></a>
             </center>
         </div>
         <ul class="product_colors">
             <?php foreach ($product->images as $image): ?>
                 <li><a href="<?= $image->imageUrl ?>" rel="shadowbox[gal]">
-                        <?= Yii::$app->imageCache->thumb($image->imageUrl, 'product_trumb2')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2')?>
                     </a></li>
             <?php endforeach; ?>
         </ul>
@@ -12,7 +12,7 @@ use yii\helpers\Url;
                 <?php if (empty($product->image)) :?>
                     <img src="/img/no_photo.png">
                 <?php else :?>
-                    <?= Yii::$app->imageCache->thumb($product->image->imageUrl, 'list')?>
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->image->imageUrl, 'list')?>
                 <?php endif?>
             </a>
         </div>
@@ -52,7 +52,7 @@ use yii\helpers\Url;
                         'catalog/product',
                         'product' => $product,
                         '#' => 'm' . $variant->product_variant_id]) ?>">
-                        <?= Yii::$app->imageCache->thumb($variant->image->imageUrl, 'product_variant')?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->image->imageUrl, 'product_variant')?>
                     </a>
                 </li>
                 <?php endif; ?>
-<?php
-/** @var \common\modules\product\models\Product $product */
-
-?>
-<div class="my_custom_card">
-    <!--<div class="new">АКЦИЯ</div>
-    <div class="top">Toп</div>-->
-    <a href="<?= \yii\helpers\Url::to(['catalog/product', 'product' => $product])?>" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
-        <div class="title_item"><?= $product->name?></div></a>
-    <?php if ($product->brand) :?>
-    <div class="brand">Бренд: <span><?= $product->brand->name?></span></div>
-    <?php endif?>
-    <div class="type"><?= implode(', ', $product->categoriesNames)?></div>
-    <?php if($product->variant) :?>
-        <div class="price"><?= $product->variant->price?> <span>грн.</span></div>
-        <button class="basket_add_but" data-id="<?= $product->variant->product_variant_id?>">в корзину</button>
-    <?php endif?>
-    <a href="#" class="compare_add_but" data-id="<?= $product->product_id?>"><span>добавить к сравнению</span></a>
-    <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-</div>
 \ No newline at end of file
@@ -128,6 +128,20 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
     <div class="content">
         <h1><?= $category->name ?></h1>
+        <div class="sort_menu">
+
+            <div class="sort_block">
+                <span>Сортировка:</span>
+                <?= \yii\widgets\LinkSorter::widget([
+                    'sort' => $productProvider->sort,
+                    'attributes' => [
+                        'name',
+                        'price',
+                    ]
+                ]);
+                ?>
+            </div>
+        </div>
         <div class="products pn">
             <ul>
                 <?php foreach($productProvider->models as $product) :?>
@@ -148,15 +162,5 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
     </div>
     <div class="both"></div>
-    <?php if(!empty($last_products)) :?>
-        <hr>
-        <div class="watched_block">
-            <h1>Вы недавно просматривали</h1>
-            <div class="flex-container">
-                <?php foreach($last_products as $product) :?>
-                    <?php require(__DIR__ .'/product_smart.php')?>
-                <?php endforeach?>
-            </div>
-        </div>
-    <?php endif?>
+    <?= \common\modules\product\widgets\lastProducts::widget()?>
 </div>
 \ No newline at end of file
@@ -122,15 +122,5 @@ $this-&gt;params[&#39;seo&#39;][&#39;key&#39;]= &#39;product_list&#39;;
         <?php endif?>
     </div>
-    <?php if(!empty($last_products)) :?>
-        <hr>
-        <div class="watched_block">
-            <h1>Вы недавно просматривали</h1>
-            <div class="flex-container">
-                <?php foreach($last_products as $product) :?>
-                    <?php require(__DIR__ .'/product_smart.php')?>
-                <?php endforeach?>
-            </div>
-        </div>
-    <?php endif?>
+    <?= \common\modules\product\widgets\lastProducts::widget()?>
 </div>
 \ No newline at end of file
 <?php
 use common\modules\product\models\Category;
 use yii\helpers\Url;
-use yii\widgets\Menu;
-
-
-foreach (Category::find ()->all () as $category){
- $categoryObject = Yii::$app->request->get('category');
- $menu[] = ['label' => $category->name ,
-     'url' => Url::to(['catalog/category', 'category' => $category]),
-     'active' => isset($categoryObject) && $categoryObject->alias == $category->alias ? true : false ];
-}
-
-$main_menu = Menu::widget([
-    'items' =>  $menu,
-]);
 ?>
-<?=$main_menu?>
+<?= \frontend\widgets\Rubrics::widget([])?>
 <div class="fr">
     <ul>
         <li class="akciya"><a href="<?= Url::to (['event/index',]) ?>">Акции</a></li>
@@ -29,47 +29,12 @@ echo BannerWidget::widget([&#39;title&#39; =&gt; &#39;HOME_UNDER_SLIDER_3&#39;]);
 echo '</div>';
 ?>
-<div class="rubrics">
-    <ul>
-        <li class="item1"><a href="<?= Url::to (['products/index', 'translit' => 'ryukzaki']) ?>">Рюкзаки</a></li>
-        <li class="item2"><a href="<?= Url::to (['products/index', 'translit' => 'sumki']) ?>">сумки</a></li>
-        <li class="item3"><a href="<?= Url::to (['products/index', 'translit' => 'chehly']) ?>">чехлы</a></li>
-        <li class="item4"><a href="<?= Url::to (['products/index', 'translit' => 'nesessery']) ?>">Несессеры</a></li>
-        <li class="item5"><a href="<?= Url::to (['products/index', 'translit' => 'koshelki']) ?>">кошельки</a></li>
-    </ul>
-    <div class="both"></div>
-</div>
+<?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics'])?>
-<?php //TODO вставляем топ товары?>
-<?// if (count ($products_top) > 0): ?>
-<!--    <div class="products">-->
-<!--        <h3>Топ товары</h3>-->
-<!--        <ul>-->
-<!---->
-<!--            --><?// foreach ($products_top as $item): ?>
-<!--                <li class="item">-->
-<!--                    --><?//= $this->render ('/products/_product', ['item' => $item, 'num' => 4]) ?>
-<!--                </li>-->
-<!--            --><?// endforeach; ?>
-<!---->
-<!--        </ul>-->
-<!--        <div class="both"></div>-->
-<!--    </div>-->
-<?// endif; ?>
-
-
-<div class="products">
-    <h3>Скидки</h3>
-    <ul>
-        <?php //TODO вставляем новинки?>
-        <!--        --><?// foreach ($products_new as $item): ?>
-        <!--            <li class="item">-->
-        <!--                --><?//= $this->render ('/products/_product', ['item' => $item, 'num' => 4]) ?>
-        <!--            </li>-->
-        <!--        --><?// endforeach; ?>
-    </ul>
-    <div class="both"></div>
-</div>
+<?= \common\modules\product\widgets\specialProducts::widget(['type' => 'promo'])?>
+<?= \common\modules\product\widgets\specialProducts::widget(['type' => 'new'])?>
+<?= \common\modules\product\widgets\specialProducts::widget(['type' => 'top'])?>
+<?= \common\modules\product\widgets\lastProducts::widget()?>
 <h2 class="why"><span>Почему</span></h2>
 html,form,
-body { padding:0;margin:0;
+body { padding:0px;margin:0px;
     font-family: 'Roboto';font-size:14px;color:#1d1d1b;height:100%;
 }
 h1,h2,h3{margin:0px;padding:0px 0px 10px 0px;}
@@ -8,7 +8,7 @@ h1,h2,h3{margin:0px;padding:0px 0px 10px 0px;}
 .fotter .wrap .fr img{position: absolute; top: 50%; margin-top: -10px; right: 0;}
 .fotter .wrap .fl {line-height: 50px;}
 .both{clear:both;}
-h1{margin:10px 0;font-size:24px;}
+h1{margin:10px 0px;font-size:24px;}
 h3{margin-bottom:30px;}
 p{margin:3px 0px;padding:0px;}
@@ -21,9 +21,9 @@ a:hover{color:#799920;}
 .f{background: #ffffff;}
 .br{-webkit-box-shadow: -1px 5px 14px 0px rgba(50, 46, 50, 0.46);
-    -moz-box-shadow:    -1px 5px 14px 0px rgba(50, 46, 50, 0.46);
-    box-shadow:         -1px 5px 14px 0px rgba(50, 46, 50, 0.46);
-    padding:20px;}
+-moz-box-shadow:    -1px 5px 14px 0px rgba(50, 46, 50, 0.46);
+box-shadow:         -1px 5px 14px 0px rgba(50, 46, 50, 0.46);
+padding:20px;}
 nav.top{background:#f5f5f5;padding:10px 0px;border-bottom:1px solid #d2d2d2;font-size:12px;}
 nav.top    ul{list-style:none;margin:0px;padding:0px;}
@@ -64,14 +64,10 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
 .basket a:link,.basket a:visited{text-decoration:none;color:#000000;font-size:18px;}
 .basket span.more {margin-bottom: -1px}
-.menu{
-    background:#596065;
-    /*border:1px solid #e8e8e8;*/
-}
+.menu{background:#596065;border:1px solid #e8e8e8;}
 .menu ul{margin:0px;padding:0px;list-style:none;}
-.menu ul li{float:left;border-left:1px solid #e8e8e8;}
-.menu ul li:first-child{border-left:none;}
-.menu ul li a{float:left;padding:15px 20px 15px 20px;text-transform: uppercase;color:#ffffff;font-size:14px;text-decoration: none;}
+.menu ul li{float:left;border-right:1px solid #e8e8e8;}
+.menu ul li a{float:left;padding:15px 20px 15px 20px;text-transform: uppercase;color:#ffffff;font-size:14px;font-weight:bold;text-decoration: none;}
 .menu ul li a:hover{color:#e5e4e4;}
 .menu ul li.active a{background:#f5f5f5;color:#596065;}
@@ -83,7 +79,7 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
 .fr ul li{border:none;}
 .akciya a{background:#f75d50;color:#ffffff;}
-.brands a{background:#95ba2f;color:#ffffff;}
+.brends a{background:#95ba2f;color:#ffffff;}
 a.myorders{color:#f75d50}
@@ -201,26 +197,26 @@ ul.product_colors li img{border:1px solid #d2d2d2;}
 .modal_box{
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 999;
-
-    background: #000;
-    filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); /* IE 5.5+*/
-    -moz-opacity: 0.5; /* Mozilla 1.6 Ð  Ð¡â€˜ Ð  Ð â€¦Ð  Ð¡â€˜Ð  Ð’Â¶Ð  Ð’Âµ */
-    -khtml-opacity: 0.5; /* Konqueror 3.1, Safari 1.1 */
-    opacity: 0.5;
-
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 999; 
+
+      background: #000;
+filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); /* IE 5.5+*/
+-moz-opacity: 0.5; /* Mozilla 1.6 Р С‘ Р Р…Р С‘Р В¶Р Вµ */
+-khtml-opacity: 0.5; /* Konqueror 3.1, Safari 1.1 */
+opacity: 0.5;
+      
 }
 #data_box{position:absolute;top:100px;z-index:1000;width:400px;background:#ffffff;
-    -webkit-box-shadow: 0 0 15px #000;
-    -moz-box-shadow: 0 0 15px #000;
-    box-shadow: 0 0 15px #000;
-    border:7px solid #1b9bb6;
-    border-radius:5px;
+  -webkit-box-shadow: 0 0 15px #000;
+  -moz-box-shadow: 0 0 15px #000;
+  box-shadow: 0 0 15px #000;
+  border:7px solid #1b9bb6;
+  border-radius:5px;
 }
 #data_box  .data_wrp{padding:25px 15px 15px 15px;}
 #data_box  .data_wrp h1{text-transform: uppercase;}
@@ -233,10 +229,10 @@ ul.product_colors li img{border:1px solid #d2d2d2;}
 .rightbar .control-label{float:left;width:80px;padding-top:5px;}
 .form-control{outline:0;border:1px solid #d8d6d6;border-radius:5px;padding:5px 0px 5px 0px;font-size:14px;text-indent:10px;margin-bottom:3px;width:250px;}
 .form-control:focus {
-    border:#1b9bb6 1px solid;
-    box-shadow: 0 0 10px #1b9bb6;
-    -webkit-box-shadow: 0 0 10px #1b9bb6;
-    -moz-box-shadow: 0 0 10px #1b9bb6;
+border:#1b9bb6 1px solid; 
+box-shadow: 0 0 10px #1b9bb6; 
+-webkit-box-shadow: 0 0 10px #1b9bb6; 
+-moz-box-shadow: 0 0 10px #1b9bb6;
 }
 .help-block{color:red;font-size:12px;margin-bottom:5px;}
@@ -341,22 +337,22 @@ ul.social {margin-top: 20px;}
     transition: all 0.5s ease-out;
 }
 .social .fb{background-position:-44px 0;
-    cursor: pointer;
+cursor: pointer;
 }
 .social .vk{
-    cursor: pointer;
+cursor: pointer;    
 }
 .social .vk:hover{background-color:#5B7FA6;}
 .social .fb:hover{background-color:#354f89;
 }
 .social .gp{background-position:-132px 0;
-    cursor: pointer;}
+cursor: pointer;}
 .social .gp:hover{background-color:#c72f21;}
 .social .tw{background-position:-144px 0;
-    cursor: pointer;}
+cursor: pointer;}
 .social .tw:hover{background-color:#6398c9;}
 .social .ok{background-position:-89px 0;
-    cursor: pointer;}
+cursor: pointer;}
 .social .ok:hover{background-color:#f88f15;}
 .social ul li a:hover{
     background-color:#065baa;
@@ -830,8 +826,8 @@ a.active{font-weight:bold;text-decoration: underline;}
     -webkit-font-smoothing: antialiased;
 }
 .sort_block ul li a.asc:after {
-    content: "â†“";
+    content: "↑";
 }
 .sort_block ul li a.desc:after {
-    content: "â†‘";
+    content: "↓";
 }
 \ No newline at end of file
+<?php
+
+namespace frontend\widgets;
+
+use common\modules\product\models\Category;
+use common\modules\product\models\CategorySearch;
+use Yii;
+use yii\base\Widget;
+use yii\web\View;
+use yii\helpers\Url;
+
+class Rubrics extends Widget {
+    public $active;
+
+    public $wrapper = '';
+
+    public function run()
+    {
+        if (!empty($this->active)) {
+            $this->active = Yii::$app->request->get('category');
+        }
+        if (!is_object($this->active)) {
+            $this->active = CategorySearch::findByAlias($this->active);
+        }
+        if (!empty($this->active)) {
+            $this->active = $this->active->category_id;
+        }
+        $items = [];
+        foreach (Category::find ()->all () as $category) {
+            $items[] = $category;[
+                'label' => $category->name ,
+                'url' => Url::to(['catalog/category', 'category' => $category]),
+                'active' => !empty($categoryObject) && $categoryObject->alias == $category->alias ? true : false,
+            ];
+        }
+
+        return $this->render('rubrics', ['items' => $items, 'wrapper' => $this->wrapper, 'active' => $this->active]);
+    }
+}
 \ No newline at end of file
+<?php
+use yii\widgets\Menu;
+?>
+<?php if(!empty($wrapper)) :?>
+<div class="<?= $wrapper?>">
+<?php endif?>
+<ul>
+    <?= $active?>
+<?php foreach($items as $i => $category) :?>
+    <li class="item<?= $category->alias?><?= ($active == $category->category_id ? ' active' : '')?>"><?= \yii\helpers\Html::a($category->name, ['catalog/category', 'category' => $category])?></li>
+<?php endforeach;?>
+</ul>
+<?php if(!empty($wrapper)) :?>
+    <div class="both"></div>
+</div>
+<?php endif?>
 \ No newline at end of file