-

Karnovsky A
1 parent 10ac5ef9
Showing 23 changed files with 549 additions and 765 deletions Show diff stats
backend/config/bootstrap.php
backend/views/layouts/main-sidebar.php
common/modules/product/CatalogUrlManager.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/BrandQuery.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/CategoryQuery.php
common/modules/product/models/CategorySearch.php
common/modules/product/models/import.php
common/modules/product/views/manage/import.php
common/modules/product/views/manage/remote-products.php
common/modules/rubrication/models/TaxOptionQuery.php
frontend/controllers/CatalogController.php
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/catalog.php
frontend/views/catalog/product.php
frontend/views/catalog/product.tmp.php
frontend/views/catalog/products.old.php
frontend/views/catalog/products.php
@@ -2,4 +2,4 @@
 Yii::setAlias('@uploadDir', dirname(dirname(__DIR__)) . '/storage/sync');
 Yii::setAlias('@uploadFileProducts', 'products.csv');
-Yii::setAlias('@productsDir', 'images/products');
 \ No newline at end of file
+Yii::setAlias('@productsDir', '@frontend/web/images/products');
 \ No newline at end of file
@@ -45,8 +45,8 @@ use yii\widgets\Menu;
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
                     ],
                     [
-                        'label' => 'Статистика импорта',
-                        'url' => ['/product/manage/import-stat'],
+                        'label' => 'Импорт товаров',
+                        'url' => ['/product/manage/import'],
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
                     ],
                 ]
@@ -46,9 +46,9 @@ class CatalogUrlManager implements UrlRuleInterface {
                 // Filter
                 if (strpos($paths[2], 'filter:') === 0) {
                     $this->parseFilter($paths[2], $params);
-                } elseif (strpos($paths[2], 'word:') === 0) {
+                }/* elseif (strpos($paths[2], 'word:') === 0) {
                     $params['word'] = substr($paths[2], 5);
-                }
+                }*/
             }
         } elseif ($paths[0] == 'product') {
             $product = ProductSearch::findByAlias($paths[1]);
@@ -99,7 +99,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                 } else {
                     $url = 'catalog/';
                 }
-                if (!empty($params['word'])) {
+                /*if (!empty($params['word'])) {
                     if (!is_array($params['word'])) {
                         $params['word'] = [$params['word']];
                     }
@@ -107,7 +107,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                 }
                 if (isset($params['word'])) {
                     unset($params['word']);
-                }
+                }*/
                 $this->setFilterUrl($params, $url);
@@ -4,6 +4,7 @@ namespace common\modules\product\controllers;
 use common\modules\product\helpers\ProductHelper;
 use common\modules\product\models\Category;
+use common\modules\product\models\Import;
 use common\modules\product\models\ProductImage;
 use common\modules\product\models\ProductVariant;
 use common\modules\product\models\RemoteProductsSearch;
@@ -261,53 +262,16 @@ class ManageController extends Controller
     }
     public function actionImport() {
-        $searchModel = new RemoteProductsSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-        return $this->render('remote-products', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
+        $model = new Import();
-    public function actionImportStat() {
-            $all_products = $new_products = $linked_products = $orpahed_products = 0;
-            $remoteProducts = RemoteProducts::find()->all();
-
-            $not_linked_cats = [];
-
-            foreach($remoteProducts as $product) {
-                if (!empty($product->product->product_id)) {
-                    $linked_products++;
-                } elseif (!empty($product->remoteCategory) && !empty($product->remoteCategory->category) && !empty($product->remoteCategory->category->category_id)) {
-                    $new_products++;
-                } else {
-                    if (!empty($product->remoteCategory)) {
-                        if (empty($not_linked_cats[$product->remoteCategory->ID])) {
-                            $not_linked_cats[$product->remoteCategory->ID] = $product->remoteCategory->Name ." (". $product->remoteCategory->ID .")";
-                        }
-                    }
-                    $orpahed_products++;
-                }
-                $all_products++;
+        if (Yii::$app->request->isPost) {
+            $file = UploadedFile::getInstances($model, 'file');
+            if (!empty($file[0]) && $model->validate() && $file[0]->saveAs(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts'))) {
+                $model->go();
             }
-
-        $op = [];
-
-            $op[] = "Всего $all_products товаров, $new_products новых и $linked_products уже связанных.";
-            if (!empty($not_linked_cats)) {
-                $op[] = "$orpahed_products товаров не привязаны к категориям:";
-                foreach ($not_linked_cats as $not_linked_cat) {
-                    $op[] = "$not_linked_cat";
-                }
-            }
-
-        return $this->render('import-stat', [
-            'all_products' => $all_products,
-            'new_products' => $new_products,
-            'linked_products' => $linked_products,
-            'orpahed_products' => $orpahed_products,
-            'not_linked_cats' => $not_linked_cats,
+        }
+        return $this->render('import', [
+            'model' => $model,
         ]);
     }
@@ -20,6 +20,7 @@ class BrandQuery extends \yii\db\ActiveQuery
      */
     public function all($db = null)
     {
+        $this->with('brandName');
         return parent::all($db);
     }
@@ -29,6 +30,7 @@ class BrandQuery extends \yii\db\ActiveQuery
      */
     public function one($db = null)
     {
+        $this->with('brandName');
         return parent::one($db);
     }
@@ -117,11 +117,7 @@ class BrandSearch extends Brand
             }
         }
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        return $dataProvider;
+        return $query;
     }
     public static function findByAlias($alias) {
@@ -133,6 +133,11 @@ class Category extends \yii\db\ActiveRecord
         return $this->hasOne(ProductUnit::className(), ['product_unit_id' => 'product_unit_id']);
     }
+    public function getProducts() {
+//        return $this->hasMany(Product::className(), ['product_id' => 'product_id'])->viaTable('product_category', ['category_id' => 'category_id']);
+        return $this->getRelations('product_categories');
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -23,6 +23,7 @@ class CategoryQuery extends \yii\db\ActiveQuery
      */
     public function all($db = null)
     {
+        $this->with('categoryName');
         return parent::all($db);
     }
@@ -32,6 +33,7 @@ class CategoryQuery extends \yii\db\ActiveQuery
      */
     public function one($db = null)
     {
+//        $this->joinWith('categoryName');
         return parent::one($db);
     }
 }
@@ -74,15 +74,15 @@ class CategorySearch extends Category
         // 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,
+            'category.category_id' => $this->category_id,
+            'category.parent_id' => $this->parent_id,
+            'category.category_name_id' => $this->category_name_id,
+            'category.product_unit_id' => $this->product_unit_id,
         ]);
-        $query->andFilterWhere(['like', 'alias', $this->alias]);
+        $query->andFilterWhere(['like', 'category.alias', $this->alias]);
-        $query->orderBy(['path' => SORT_ASC, 'depth' => SORT_ASC, 'category_id' => SORT_ASC]);
+        $query->orderBy(['category.path' => SORT_ASC, 'category.depth' => SORT_ASC, 'category.category_id' => SORT_ASC]);
         return $dataProvider;
     }
+<?php
+
+namespace common\modules\product\models;
+
+use common\modules\product\models\Category;
+use common\modules\product\models\CategoryName;
+use common\modules\product\models\ProductImage;
+use common\modules\product\models\ProductVariantType;
+use common\modules\rubrication\models\TaxOption;
+use common\modules\rubrication\models\TaxValueString;
+use Yii;
+use common\modules\product\models\Brand;
+use common\modules\product\models\BrandName;
+use common\modules\product\models\Product;
+use common\modules\product\models\ProductVariant;
+use common\modules\product\models\RemoteProducts;
+use yii\base\Model;
+
+class Import extends Model {
+    public $file;
+
+    public $errors = [];
+    public $output = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+//            [['file'], 'safe'],
+            [['file'], 'file'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'file' => Yii::t('product', 'File'),
+        ];
+    }
+
+    public function go() {
+
+        $new_products = $linked_products = 0;
+
+        $db = yii::$app->db;
+
+        if ( !($handle = $this->getProductsFile()) ) {
+            $this->errors[] = 'File not found';
+            return FALSE;
+        }
+
+        $j = 0;
+
+        while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE)
+        {
+            $j++;
+            /*if ($j > 10) {
+                return TRUE;
+            }*/
+
+            foreach ($data as &$value)
+            {
+                //$value = mb_convert_encoding ($value,  "UTF-8", mb_detect_encoding ($value));
+                $value = iconv ('windows-1251', "UTF-8//TRANSLIT//IGNORE", $value);
+                $value = trim ($value);
+            }
+
+            // будет всегда 19 элементов
+            for ($i = 0; $i <= 18; $i++)
+            {
+                if (! isset ($data[$i]))
+                {
+                    $data[$i] = null;
+                }
+            }
+
+            // 1  Группа (категория)
+            $catalog_name = $data[0];
+            if (empty ($catalog_name))
+            {
+                CONTINUE;
+            }
+
+            // 2  Бренд
+            $brand_name = $data[1];
+            if (empty ($brand_name))
+            {
+                CONTINUE;
+            }
+
+            // 3  Название товара
+            $product_name = $data[2];
+            if (empty ($product_name))
+            {
+                CONTINUE;
+            }
+
+            // 4  Описание Укр
+            $product_body_uk = $data[3];
+
+            // 5  Описание Рус
+            $product_body_ru = $data[4];
+
+            // 6  Фильтр (через запятую)
+            $filters = explode (',', $data[5]);
+
+            // 7  Доп фильтр через запятую
+            $filters_extra = explode (',', $data[6]);
+
+            // 8  Пол череззапятую (мужской, женский, детский, унисекс)
+            $gender = explode (',', $data[7]);
+
+            // 9  Год
+            $years = explode (',', $data[8]);
+
+            // 10 Цена старая
+            $product_cost_old = $data[10];
+
+            // 11 Цена
+            $product_cost = $data[9];
+
+            // 12 Акция
+            $product_akciya = (bool)$data[11];
+
+            // 13 Сопуд. Тов.
+            $similar = explode (',', $data[12]);
+
+            // 14 Новинки
+            $product_new = (bool)$data[13];
+
+            // 15 Топ продаж
+            $product_top = (bool)$data[14];
+
+            // 16 Сетка  Характеристик
+            $feature = explode ('=', $data[15]);
+
+            // 17 ВИДЕО КОД
+            $product_video = $data[16];
+
+            // 18 Галлерея фото
+            $fotos = explode (',', $data[17]);
+
+            // 19 Штрих код товара.
+            // расшифровал - это модификации товара!
+
+            $product_image = explode ('=', $data[18]);
+            $product_image = @$product_image[3];
+
+            if ( ($_product = Product::find()->filterWhere(['ilike', 'name', trim($product_name)])->one()) === null ) {
+                $_product = new Product();
+            }
+
+            $is_new_product = empty($_product->product_id);
+
+            // ==== Set category ====
+            if ( ($category = CategoryName::find()->filterWhere(['ilike', 'value', trim($catalog_name)])->one()) === null ) {
+                // Create category
+                $category = new Category();
+                $category->name = trim($catalog_name);
+                $category->save();
+            }
+            $_product->categories = [$category->category_id];
+
+            // ===== Set brand ====
+            if ( $brand_name ) {
+                if ( ($brand = BrandName::find()->filterWhere(['ilike', 'value', trim($brand_name)])->one()) !== null ) {
+                    $_product->brand_id = $brand->brand_id;
+                } else {
+                    // Create brand
+                    $brand = new Brand();
+                    $brand->name = trim($brand_name);
+                    $brand->save();
+                    $_product->brand_id = $brand->brand_id;
+                }
+            }
+
+            $_product->name = $product_name;
+            $_product->video = $product_video;
+            $_product->description = $product_body_ru;
+            $_product->is_top = $product_top;
+            $_product->akciya = $product_akciya;
+            $_product->is_new = $product_new;
+
+            if (!$_product->save()) {
+                $this->errors[] = 'Product #'. $_product->name .' not saved';
+                continue;
+            }
+
+            // нужно для проставления характеристик относящихся к модификациям
+            $MOD_ARRAY = [];
+
+            for ($i = 18; $i < count ($data); $i ++)
+            {
+                if (! empty ($data[$i]))
+                {
+                    $mod_arr    = explode ('=', $data[$i]);
+                    $mod_art    = $mod_arr[0];
+                    $mod_size   = $mod_arr[1];
+                    $mod_color  = $mod_arr[2];
+                    $mod_image  = $mod_arr[3];
+                    $mod_cost   = floatval($product_cost);
+                    $mod_old_cost = floatval($product_cost_old);
+
+                    // Check product variant
+                    if ( ($_productVariant = ProductVariant::find()->andFilterWhere(['ilike', 'sku', $mod_art])->andFilterWhere(['product_id' => $_product->product_id])->one()) === null ) {
+                        $_productVariant = new ProductVariant();
+                        $_productVariant->product_id = $_product->product_id;
+                    }
+                    $_productVariant->product_unit_id = 1;
+
+                    $_productVariant->sku = $mod_art;
+                    $_productVariant->price = $mod_cost;
+                    $_productVariant->price_old = $mod_old_cost;
+                    $_productVariant->stock = 1;
+
+                    $product_variant_type_name = '';
+                    if (! empty ($mod_color)) {
+                        $product_variant_type_name = 'Цвет';
+                        $_productVariant->name = $mod_color;
+                    }
+                    elseif (! empty ($mod_size)) {
+                        $product_variant_type_name = 'Размер';
+                        $_productVariant->name = $mod_size;
+                    }
+
+                    // ===== Set variant type ====
+                    if ( $product_variant_type_name ) {
+                        if ( ($product_variant_type = ProductVariantType::find()->filterWhere(['ilike', 'name', $product_variant_type_name])->one()) !== null ) {
+                            $_productVariant->product_variant_type_id = $product_variant_type->product_variant_type_id;
+                        } else {
+                            $product_variant_type = new ProductVariantType();
+                            $product_variant_type->name = $product_variant_type_name;
+                            $product_variant_type->save();
+                            $_productVariant->product_variant_type_id = $product_variant_type->product_variant_type_id;
+                        }
+                    }
+                    $_productVariant->save(false);
+
+                    $MOD_ARRAY[] = $_productVariant->product_variant_id;
+
+                    if ($mod_image) {
+                        $url = 'http://rukzachok.com.ua/upload/mod/' . urlencode($mod_image);
+                        $image = @file_get_contents($url);
+                        if ($image) {
+                            if (($variantImage = ProductImage::find()->andFilterWhere(['ilike', 'image', $mod_image])->andFilterWhere(['product_variant_id' => $_productVariant->product_variant_id])->one()) === null) {
+                                file_put_contents(Yii::getAlias('@productsDir') . "/" . $mod_image, $image);
+                                $variantImage = new ProductImage();
+                                $variantImage->product_id = $_product->product_id;
+                                $variantImage->product_variant_id = $_productVariant->product_variant_id;
+                                $variantImage->image = $mod_image;
+                                $variantImage->save();
+                            }
+                        }
+                    }
+                }
+            }
+
+            $options = [];
+
+            if (! empty ($filters)) {
+                // Set Naznachenie (tax_group_id = 20)
+                foreach($filters as $filter) {
+                    $filter = trim($filter);
+                    if (!$filter) {
+                        continue;
+                    }
+                    if ( ($value = TaxValueString::find()->innerJoinWith('taxOption')->andFilterWhere(['ilike', 'value', $filter])->andFilterWhere(['tax_option.tax_group_id' => 20])->one()) === null ) {
+                        // Create option
+                        $option = new TaxOption();
+                        $option->tax_group_id = 20;
+                        $option->save();
+
+                        $value = new TaxValueString();
+                        $value->tax_option_id = $option->tax_option_id;
+                        $value->value = $filter;
+                        $value->save();
+
+                        $option->default_value = $value->tax_value_id;
+                        $option->save();
+                    }
+                    $options[] = $value->tax_option_id;
+                }
+            }
+
+            if (! empty ($years)) {
+                // Set God (tax_group_id = 21)
+                foreach($years as $filter) {
+                    $filter = trim($filter);
+                    if (!$filter) {
+                        continue;
+                    }
+                    if ( ($value = TaxValueString::find()->innerJoinWith('taxOption')->andFilterWhere(['ilike', 'value', $filter])->andFilterWhere(['tax_option.tax_group_id' => 21])->one()) === null ) {
+                        // Create option
+                        $option = new TaxOption();
+                        $option->tax_group_id = 21;
+                        $option->save();
+
+                        $value = new TaxValueString();
+                        $value->tax_option_id = $option->tax_option_id;
+                        $value->value = $filter;
+                        $value->save();
+
+                        $option->default_value = $value->tax_value_id;
+                        $option->save();
+                    }
+                    $options[] = $value->tax_option_id;
+                }
+            }
+
+            if (! empty ($gender)) {
+                // Set Pol (tax_group_id = 22)
+                foreach($gender as $filter) {
+                    $filter = trim($filter);
+                    if (!$filter) {
+                        continue;
+                    }
+                    if ( ($value = TaxValueString::find()->innerJoinWith('taxOption')->andFilterWhere(['ilike', 'value', $filter])->andFilterWhere(['tax_option.tax_group_id' => 22])->one()) === null ) {
+                        // Create option
+                        $option = new TaxOption();
+                        $option->tax_group_id = 22;
+                        $option->save();
+
+                        $value = new TaxValueString();
+                        $value->tax_option_id = $option->tax_option_id;
+                        $value->value = $filter;
+                        $value->save();
+
+                        $option->default_value = $value->tax_value_id;
+                        $option->save();
+                    }
+                    $options[] = $value->tax_option_id;
+                }
+            }
+
+            if (!empty($options)) {
+                $_product->options = $options;
+            }
+
+            $_product->save();
+
+            $this->output[] = "$j: Product {$_product->name} #{$_product->product_id} saved (". ($is_new_product ? 'new product' : 'exists product') .")";
+        }
+
+        fclose ($handle);
+
+        return TRUE;
+    }
+
+    private function getProductsFile() {
+        $filename = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts');
+        if (!is_file($filename)) {
+            $this->stderr("File $filename not found");
+            return FALSE;
+        }
+        return fopen ($filename, 'r');
+    }
+}
 \ No newline at end of file
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+?>
+
+<div class="product-import-form">
+    <?php $form = ActiveForm::begin([
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
+
+    <?php if($model->errors) :?>
+    <div class="error">
+        <?= implode("<br>\n", $model->errors);?>
+    </div>
+    <?php endif?>
+
+    <?php if($model->output) :?>
+    <div class="success">
+        <?= implode("<br>\n", $model->output);?>
+    </div>
+    <?php endif?>
+
+    <?= $form->field($model, 'file')->widget(\kartik\file\FileInput::classname(), [
+        'language' => 'ru',
+        'options' => [
+            'multiple' => false,
+        ],
+        'pluginOptions' => [
+            'allowedFileExtensions' => ['csv'],
+            'overwriteInitial' => true,
+            'showRemove' => false,
+            'showUpload' => false,
+        ],
+    ])?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('product', 'Import'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+</div>
-<?php
-
-use yii\helpers\Html;
-use kartik\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel common\modules\product\models\RemoteProductsSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = Yii::t('product', 'Remote Products');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="remote-products-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-
-    <p>
-        <?= Html::a(Yii::t('product', 'Import selected'), ['import'], ['class' => 'btn btn-success']) ?>
-    </p>
-    <?= GridView::widget([
-        'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'Name',
-            'ID_chief',
-            'Article',
-            'Price',
-            'Price_old',
-             'Brand',
-             'ID',
-             'Date_create',
-            'remoteCategory.category.name',
-            'remoteCategory.Name',
-            // 'local_id',
-
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
-    ]); ?>
-</div>
@@ -23,6 +23,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery
      */
     public function all($db = null)
     {
+        $this->with('value');
         return parent::all($db);
     }
@@ -32,6 +33,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery
      */
     public function one($db = null)
     {
+        $this->with('value');
         return parent::one($db);
     }
 }
@@ -39,10 +39,13 @@ class CatalogController extends \yii\web\Controller
         $word = trim(Yii::$app->request->get('word', ''));
         if (empty($category->category_id) && empty($word)) {
-            throw new HttpException(404 ,'Page not found');
+            return $this->render(
+                'catalog'
+            );
         }
-        if (!empty($word)) {
+        if (!empty($word))
+        {
             $params = [];
             $params['keywords'] = explode(' ', preg_replace("|[\s,.!:&?~();-]|i", " ", $word));
@@ -75,7 +78,9 @@ class CatalogController extends \yii\web\Controller
                 ]
             );
-        } else {
+        }
+        else
+        {
             $params = [];
             if ( !empty($filter['brands']) ) {
@@ -127,11 +132,11 @@ class CatalogController extends \yii\web\Controller
             $productProvider = $productModel->search($category, $params);
             $brandModel = new BrandSearch();
-            $brandProvider = $brandModel->getBrands($category, $params);
+            $brands = $brandModel->getBrands($category, $params)->all();
-            $optionsProvider = $productModel->optionsForCategory($category, $params);
+            $optionsQuery = $productModel->optionsForCategory($category, $params);
             $groups = [];
-            foreach ($optionsProvider->models as $option) {
+            foreach ($optionsQuery->all() as $option) {
                 if (!isset($groups[$option->tax_group_id])) {
                     $groups[$option->tax_group_id] = $option->taxGroup;
                     $groups[$option->tax_group_id]->_options = [];
@@ -150,11 +155,10 @@ class CatalogController extends \yii\web\Controller
                 [
                     'category'          => $category,
                     'brandModel'        => $brandModel,
-                    'brandProvider'     => $brandProvider,
+                    'brands'            => $brands,
                     'filter'            => $filter,
                     'productModel'      => $productModel,
                     'productProvider'   => $productProvider,
-                    'optionsProvider'   => $optionsProvider,
                     'groups'            => $groups,
                     'priceLimits'       => $priceLimits,
                 ]
@@ -3,6 +3,8 @@
 namespace frontend\models;
 use common\modules\product\models\Brand;
+use common\modules\product\models\BrandName;
+use common\modules\product\models\CategoryName;
 use common\modules\product\models\ProductCategory;
 use common\modules\product\models\ProductOption;
 use common\modules\product\models\ProductSearch;
@@ -47,11 +49,12 @@ class ProductFrontendSearch extends Product {
     public function search($category = null, $params = []) {
         if (!empty($category)) {
             /** @var ActiveQuery $query */
-            $query = $category->getRelations('product_categories');
+//            $query = $category->getRelations('product_categories');
+            $query = $category->getProducts();
         } else {
             $query = Product::find();
         }
-        $query->with(['variant', 'brand', 'brand.brandName', 'category', 'category.categoryName']);
+        $query->joinWith(['variant', 'brand', 'brand.brandName', 'category', 'category.categoryName']);
         $query->groupBy('product.product_id');
@@ -123,17 +126,14 @@ class ProductFrontendSearch extends Product {
             $query->andWhere([Product::tableName() .'.brand_id' => $params['brands']]);
         }
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        return $dataProvider;
+        return $query;
     }
     public function priceLimits($category = null, $params = []) {
         if (!empty($category)) {
             /** @var ActiveQuery $query */
-            $query = $category->getRelations('product_categories');
+//            $query = $category->getRelations('product_categories');
+            $query = $category->getProducts();
         } else {
             $query = Product::find();
         }
@@ -158,7 +158,9 @@ class ProductFrontendSearch extends Product {
                 $params['keywords'] = [$params['keywords']];
             }
             foreach ($params['keywords'] as $keyword) {
-                $query->andFilterWhere(['ilike', Product::tableName() .'.name', $keyword]);
+                $query->orFilterWhere(['ilike', Product::tableName() .'.name', $keyword]);
+                $query->orFilterWhere(['ilike', BrandName::tableName() .'.value', $keyword]);
+                $query->orFilterWhere(['ilike', CategoryName::tableName() .'.value', $keyword]);
             }
         }
         if (!empty($params['special'])) {
+<?php
+use yii\helpers\Url;
+use yii\widgets\Breadcrumbs;
+
+$this->title = 'Каталог';
+$this->params['breadcrumbs'][] = ['label' => 'Каталог'];
+?>
+
+<nav class="bread-crumbs">
+    <?= Breadcrumbs::widget ([
+        'links' => $this->params['breadcrumbs'],
+    ])
+    ?>
+    <div class="both"></div>
+</nav>
+
+<div class="loyout">
+    <div class="content">
+        <h1>Каталог</h1>
+        <?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [124,125,126,127,128]])?>
+    </div>
+    <div class="both"></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()?>
+</div>
@@ -8,9 +8,10 @@ $this-&gt;title = $product-&gt;fullname;
 //$this->registerMetaTag (['name' => 'description', 'content' => ((! empty($product->meta_description)) ? $product->meta_description : $product->fullname)]);
 //$this->registerMetaTag (['name' => 'keywords', 'content' => $product->meta_keywords]);
-foreach($product->category->getParents()->all() as $parent) {
-    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
-}
+//foreach($product->category->getParents()->all() as $parent) {
+//    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
+//}
+$this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['catalog/category']];
 $this->params['breadcrumbs'][] = ['label' => $product->category->categoryName->value, 'url' => ['catalog/category', 'category' => $product->category]];
 $this->params['breadcrumbs'][] = $product->fullname .' #'. $product->variant->sku;
@@ -82,13 +83,9 @@ $this-&gt;registerJs (&quot;
 <nav class="bread-crumbs">
     <?= Breadcrumbs::widget ([
-        'links' => [
-            ['label' => 'Каталог', 'url' => ['catalog/all']],
-            // ['label'=>$catalog->parent->name,'url'=>['catalog/index','translit'=>$catalog->parent->translit]],
-            ['label' => $category->name, 'url' => ['catalog/category', 'category' => $category]],
-            $product->fullname,
-        ],
-    ]) ?>
+        'links' => $this->params['breadcrumbs'],
+    ])
+    ?>
     <div class="both"></div>
 </nav>
 <?php if ($flash = Yii::$app->session->getFlash ('success')): ?>
@@ -110,7 +107,6 @@ $this-&gt;registerJs (&quot;
                        data-imageoriginal="<?= $variant->imageUrl ?>"
                        title="<?= $product->fullname ?>">
                         <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
-
                     </a>
                 </li>
             <?php endforeach; ?>
-<?php
-/** @var $this \yii\web\View */
-/** @var $dataProvider \yii\data\ActiveDataProvider */
-$this->title = $product->name;
-foreach($product->category->getParents()->all() as $parent) {
-    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
-}
-$this->params['breadcrumbs'][] = ['label' => $product->category->categoryName->value, 'url' => ['catalog/category', 'category' => $product->category]];
-$this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
-?>
-<h1 class="open_card_item_title"><?= $product->name .' '. $product->variant->name?></h1>
-
-<div class="item_3_blocks_wrap" id="one_item_block" data-id="<?= $product->variant->product_variant_id?>"> <!-- flex container -->
-    <div class="item_img_block"> <!-- блок с фотографиями -->
-        <div class="main_img">
-            <?php if (empty($product->image)) :?>
-            <img src="/images/no_photo_big.png" alt="<?= $product->name?>">
-            <?php else :?>
-                <img src="<?= $product->image->imageUrl?>" alt="<?= $product->image->alt ? $product->image->alt : $product->name?>">
-            <?php endif?>
-
-            <!--<span class="new">НОВИНКА</span>
-            <span class="top">ТОП</span>-->
-        </div>
-        <div class="product_service">
-            <ul>
-                <li class="item1"><a id="add_to_bookmarks" href="#">Добавить в закладки</a>
-                </li>
-                <li class="item3"><a id="add_to_compare" href="#">Добавить в сравнение</a></li>
-            </ul>
-        </div>
-        <?php if (!empty($product->images)) :?>
-        <div class="main_img_slide">
-            <?php foreach($product->images as $image) :?>
-            <div class="small_img_block active">
-                <img src="<?= $image->imageUrl?>" alt="<?= $image->alt ? $image->alt : $product->name?>">
-            </div>
-            <?php endforeach?>
-
-            <img class="slider_arrow_right" src="/images/slider_right.png" alt="">
-            <img class="slider_arrow_left" src="/images/slider_left.png" alt="">
-        </div>
-        <?php endif?>
-
-    </div> <!-- конец блока с фотографиями -->
-
-
-    <div class="busket_block"> <!-- блок с счетчиком и кнопкой добавить в корзину -->
-        <div class="top_code">
-            <span class="code">Код: <?= $product->variant->sku?></span>
-            <span class="have"><img src="/images/ok_icon_green.png" alt=""><?= $product->stock !== 0 && $product->variant->price > 0 ? ' есть в наличии' : ' нет в наличии'?></span>
-        </div>
-
-        <div class="grey_bg">
-            <div class="counter">
-                <?php if ($product->variant->price > 0) :?>
-                <div class="price">
-                    <?= $product->variant->price?>
-                </div>
-                <div class="sign">грн.</div>
-                <?php else :?>
-                    <div class="price"></div>
-                <?php endif?>
-
-                <div class="count_block">
-                    <input type="text" name="" class="form-control buy_one_item" value="1">
-                    <div class="count_buttons">
-                        <div class="button_plus">+</div>
-                        <div class="button_minus">-</div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="in_cart_btn">
-                <a href="#">
-                    <button class="cart_btn" data-id="<?= $product->variant->product_variant_id?>"> в корзину <img src="/images/ico_basket_white.png" alt=""></button>
-                </a>
-            </div>
-
-            <!--<div class="to_compare_link">
-                <img src="/images/ico_scales.png" alt="">
-                <a href="#" class="add_to_compare">добавить к сравнению</a>
-            </div>-->
-        </div>
-        <div class="quick_order">
-            <form action="">
-                <span class="text">БЫСТРЫЙ ЗАКАЗ</span>
-                <input type="text" class="quick_order_phone" name="quick_order_phone" placeholder="(0XX) XXX-XX-XX">
-                <button type="submit">заказать</button>
-            </form>
-        </div>
-
-        <div class="delivery">
-            <p>
-                Доставка товара на следующий день после выставления счета. Мы доставим “День в <br> день” — уточните это у менеджера.
-            </p>
-            <a href="#">Подробно о доставке</a>
-        </div>
-
-    </div><!-- конец блока с счетчиком и кнопкой добавить в корзину -->
-
-    <div class="character_block"> <!-- блок с характеристиками -->
-        <?php if (!empty($properties)) :?>
-        <h3>Характеристики</h3>
-        <ul>
-            <?php foreach($properties as $group) :?>
-            <li>
-                <div class="each">
-                    <div class="title"><?= $group->name?></div>
-                    <div class="tech">
-                    <?php foreach($group->_options as $option) :?>&nbsp;<?= $option->ValueRenderHTML?><?php endforeach?>
-                    </div>
-                </div>
-            </li>
-            <?php endforeach?>
-        </ul>
-        <?php endif?>
-
-        <!--<div class="tech_links">
-            <a href="#">Описание</a>
-            <a href="#">Видео</a>
-            <a href="#">Отзывы(12)</a>
-        </div>-->
-
-    </div><!-- закрытие блока с характеристиками -->
-    <hr>
-
-    <h1 class="with_this">С этим товаром покупают</h1>
-
-    <div class="flex_container"><!-- блок - с этим также покупают -->
-
-        <div class="my_custom_card">
-            <div class="new">АКЦИЯ</div>
-            <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
-                <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
-            <div class="brand">Бренд: <span>Knauf</span></div>
-            <div class="type">Штукатурки</div>
-            <div class="price">102.05 <span>грн.</span></div>
-            <button class="basket_add_but">в корзину</button>
-            <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
-            <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-        </div>
-
-        <div class="my_custom_card">
-            <div class="new">АКЦИЯ</div>
-            <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
-                <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
-            <div class="brand">Бренд: <span>Knauf</span></div>
-            <div class="type">Штукатурки</div>
-            <div class="price">102.05 <span>грн.</span></div>
-            <button class="basket_add_but">в корзину</button>
-            <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
-            <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-        </div>
-
-        <div class="my_custom_card">
-            <div class="new">АКЦИЯ</div>
-            <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
-                <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
-            <div class="brand">Бренд: <span>Knauf</span></div>
-            <div class="type">Штукатурки</div>
-            <div class="price">102.05 <span>грн.</span></div>
-            <button class="basket_add_but">в корзину</button>
-            <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
-            <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-        </div>
-
-        <div class="my_custom_card">
-            <div class="new">АКЦИЯ</div>
-            <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
-                <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
-            <div class="brand">Бренд: <span>Knauf</span></div>
-            <div class="type">Штукатурки</div>
-            <div class="price">102.05 <span>грн.</span></div>
-            <button class="basket_add_but">в корзину</button>
-            <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
-            <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-        </div>
-
-    </div> <!-- конец блока - с этим также покупают -->
-    <div class="tabs_block"> <!-- Табы с описанием видео и отзывами -->
-        <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name">
-            <ul class="ionTabs__head">
-                <?php if (!empty($properties)) :?>
-                <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li>
-                <?php endif?>
-                <?php if (TRUE || !empty($product->description)) :?>
-                <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li>
-                <?php endif?>
-                <?php if (TRUE || !empty($product->video)) :?>
-                <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li>
-                <?php endif?>
-<!--                <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>-->
-            </ul>
-            <div class="ionTabs__body">
-                <?php if (!empty($properties)) :?>
-                <div class="ionTabs__item character_block" data-name="Tab_1_name">
-                        <ul>
-                            <?php foreach($properties as $group) :?>
-                                <li>
-                                    <div class="each">
-                                        <div class="title"><?= $group->name?></div>
-                                        <div class="tech">
-                                            <?php foreach($group->_options as $option) :?>&nbsp;<?= $option->ValueRenderHTML?><?php endforeach?>
-                                        </div>
-                                    </div>
-                                </li>
-                            <?php endforeach?>
-                        </ul>
-                </div>
-                <?php else :?>
-                <?php endif?>
-                <?php if (!empty($product->description)) :?>
-                <div class="ionTabs__item" data-name="Tab_2_name">
-                    <?= $product->description?>
-                </div>
-                <?php endif?>
-                <?php if (!empty($product->video)) :?>
-                <div class="ionTabs__item" data-name="Tab_3_name">
-                    <?= $product->video?>
-                </div>
-                <?php endif?>
-
-                <div class="ionTabs__preloader"></div>
-            </div>
-        </div>
-
-    </div> <!-- конец табов с описанием видео и отзывами -->
-    <div style="clear: 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?>
-
-</div> <!-- end flex container -->
-<?php
-/** @var $this \yii\web\View */
-/** @var $dataProvider \yii\data\ActiveDataProvider */
-
-$this->title = $category->categoryName->value;
-foreach($category->getParents()->all() as $parent) {
-    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'alias' => $parent->alias]];
-}
-$this->params['breadcrumbs'][] = $category->categoryName->value;
-?>
-<script type="text/javascript">
-    $(document).ready(function() {
-        // price rangeslider (filter price slider)
-        $("#price_interval").ionRangeSlider({
-            type: "double",
-            min: <?= $priceMin?>,
-            max: <?= $priceMax?>,
-            from: <?= $priceMinCurr?>,
-            to: <?= $priceMaxCurr?>,
-            grid: false
-        });
-    });
-</script>
-<div class="w_960">
-    <!-- side bar with all filters -->
-    <div class="cat_p_filter_bar">
-        <div class="title">ФИЛЬТРЫ</div>
-        <div class="filter_list">
-            <form action="#" name="filter_catalog_page_form">
-                <ul>
-                    <li>Цена:
-                        <div class="arrow"><img src="/images/head_up.png" alt=""></i></div>
-                        <div class="price_filter first_price_li">
-                            <div class="price_slider">
-                                <input type="text" id="price_interval" name="price_interval" value="" />
-                            </div>
-                            <!--<div class="checkbox">
-                                <label><input type="checkbox" name="venecia" value="0" /></label>
-                                <a href="#">Акции</a>
-                            </div>
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="venecia" value="0" /></label>
-                                <a href="#">Товар в наличии</a>
-                            </div>
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="venecia" value="0" /></label>
-                                <a href="#">Хит продаж</a>
-                            </div>-->
-                        </div>
-                    </li>
-
-                    <?php if ($brands_count) :?>
-                    <li>Бренд
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter<?= !empty($_brands)?' active-field':''?>">
-                        <?php foreach($brands as $brand) :?>
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="brand[]" value="<?= $brand->alias?>"<?= isset($_GET['brand']) && in_array($brand->alias, $_GET['brand']) ? ' checked' : ''?> /></label>
-                                <a href="#<?php /*= \yii\helpers\Url::to(['brand', 'alias' => $brand->alias])*/?>"><?= $brand->name?><!-- (<?php /*= $brand->getProducts()->count()*/?>)--></a>
-                            </div>
-                        <?php endforeach?>
-                            <!--<div class="checkbox see_all">
-                                <i class="fa fa-plus-circle"></i>
-                                <a href="#">посмотреть все</a>
-                            </div>-->
-                        </div>
-                    </li>
-                    <?php endif?>
-
-                    <?php if (!empty($groups)) :?>
-                    <div class="title_2">ПОДБОР ПО ПАРАМЕТРАМ</div>
-
-                        <?php foreach($groups as $group) :?>
-                        <li><?= $group->name?>
-                            <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                            <div class="price_filter<?= isset($options[$group->alias])?' active-field':''?>">
-                                <?php foreach($group->_options as $option) :?>
-                                <div class="checkbox">
-                                    <label><input type="checkbox" name="option[<?= $group->alias?>][]" value="<?= $option->alias?>"<?= (isset($options[$group->alias]) && in_array($option->alias, $options[$group->alias])) ? ' checked' : ''?> /></label>
-                                    <a href="#"><?= $option->ValueRenderHTML?>&nbsp;(<?= $option->_items_count?>)</a>
-                                </div>
-                                <?php endforeach?>
-                            </div>
-                        </li>
-                        <?php endforeach?>
-                    <?php endif?>
-
-                </ul>
-
-                <div class="filter_accept_bloc">
-                    <button type="submit" class="filter_accept_btn">применить</button>
-                    <a href="#" class="form_checkbox_reset">сбросить фильтры</a>
-                </div>
-            </form>
-            <!--<div class="product_list">
-                <h2 class="title">КАТАЛОГ ТОВАРОВ</h2>
-                <ul>
-                    <li>Битумная черепица
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Комплектация кровли
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Водосточные системы
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Чердачные лестницы
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Мансардные окна
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Металлочерепица
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Плоская кровля
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Профнастил
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>Ондулин
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                    <li>OSB плиты
-                        <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
-                        <div class="price_filter">
-                            <a href="#">RUUKI</a>
-                            <a href="#">Venecia</a>
-                        </div>
-                    </li>
-
-                </ul>
-            </div>-->
-        </div>
-
-
-    </div>
-
-    <!-- catalog list with all item cards -->
-    <div class="cat_p_catalog_list">
-        <div class="title"><?= $category->categoryName->value?> <span>(<?= $all_count?>)</span></div>
-
-        <?php if (empty($products)) :?>
-            <h2>По данному запросу товары не найдены.</h2><br>
-            <p>Показать <a href="<?= \yii\helpers\Url::to(['catalog/category', 'alias' => $category->alias])?>">все товары из категории "<?= $category->categoryName->value?>"</a></p>
-        <?php else :?>
-        <!-- sort menu -->
-        <div class="sort_menu">
-
-            <div class="sort_price">
-                <span>Сортировка:</span>
-                <?= \yii\widgets\LinkSorter::widget([
-                    'sort' => $sort,
-                    'attributes' => [
-                        'name',
-                        'price',
-                    ]
-                ]);
-                ?>
-                <!--
-                <select name="sort_price" id="" class="sort_price_select">
-                    <option value="price">по цене</option>
-                    <option value="popular">новые</option>
-                    <option value="sale">по акции</option>
-                </select>
-                <i class="fa fa-angle-down"></i>-->
-            </div>
-
-            <div class="show">
-                <!--<span>Показывать по:</span>
-                <ul>
-                    <li><a class="active" href="#">24</a></li>
-                    <li><a href="#">48</a></li>
-                    <li><a href="#">96</a></li>
-                </ul>-->
-            </div>
-
-            <div class="show_pages">
-                <?php if ($pages->totalCount > $pages->pageSize) :?>
-                <span>Страница:</span>
-                <?= \yii\widgets\LinkPager::widget([
-                    'pagination' => $pages,
-                    'options' => ['class' => 'pagination pull-right'],
-                ]);
-                ?>
-                <!--<i class="fa fa-caret-right"></i>-->
-                <?php endif?>
-            </div>
-
-        </div>
-
-
-        <div class="cat_p_item_card_list">
-            <div class="novelty">
-                <div class="content">
-                    <div class="novelty_cont">
-                    <?php foreach($products as $product) :?>
-                        <?php require(__DIR__ .'/product_item.php')?>
-                    <?php endforeach?>
-                    </div>
-
-                    <?php if ($pages->totalCount > $pages->pageSize) :?>
-                    <!-- LOAD MORE BUTTON -->
-                    <!--button class="load_more_btn">Загрузить еще <?= $per_page?> товара</button-->
-
-                    <div class="show_pages">
-                        Страница:
-                        <?= \yii\widgets\LinkPager::widget([
-                            'pagination' => $pages,
-                            'options' => ['class' => 'pagination pull-right'],
-                        ]);
-                        ?>
-                        <!--<i class="fa fa-caret-right"></i>-->
-                    </div>
-                    <?php endif?>
-                    <hr>
-
-                    <?php if(!empty($category->description)) :?>
-                    <div class="description">
-                        <?= $category->description?>
-
-                        <div class="empty_padding_400"></div>
-                    </div>
-                    <?php endif?>
-                </div>
-            </div>
-        </div>
-
-        <?php endif?>
-    </div>
-</div>
-
 <?php
 /** @var $this \yii\web\View */
 /** @var $productProvider \yii\data\ActiveDataProvider */
-/** @var $brandProvider \yii\data\ActiveDataProvider */
 use yii\helpers\Url;
@@ -10,9 +9,10 @@ use yii\web\View;
 use common\modules\product\helpers\ProductHelper;
 $this->title =  $category->categoryName->value;
-foreach($category->getParents()->all() as $parent) {
-    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
-}
+//foreach($category->getParents()->all() as $parent) {
+//    $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
+//}
+$this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['catalog/category']];
 $this->params['breadcrumbs'][] = $category->categoryName->value;
 $this->params['seo']['title'] = $category->name;
@@ -102,11 +102,11 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
                     <a href="<?= Url::to(['catalog/category', 'category' => $category])?>" class="_form_checkbox_reset">сбросить фильтры</a>
                 </div>
             <?php endif?>
-                <?php if ($brandProvider->totalCount > 0) :?>
+                <?php if ($brands) :?>
                 <div class="filters">
                     <div class="begin">Бренды</div>
                         <ul>
-                            <?php foreach($brandProvider->models as $brand) :
+                            <?php foreach($brands as $brand) :
                                 $checked = !empty($filter['brands']) && in_array($brand->alias, $filter['brands']);
                                 $option_url = Url::to(['catalog/category', 'category' => $category, 'filter' => ProductHelper::getFilterForOption($filter, 'brands', $brand->alias, $checked)]);
                                 ?>
@@ -11,116 +11,62 @@ $page_data = [
     'keywords' => implode(' ', $keywords),
 ];
+$this->params['breadcrumbs'][] = ['label' => 'Поиск', 'url' => ['catalog/category', 'word' => implode(' ', $keywords)]];
 if (!empty($category)) {
+    $this->params['breadcrumbs'][] = $category->categoryName->value;
     $page_data['category'] = $category->name;
 }
 $this->title =  Yii::t('product', "Search for \"{keywords}\"". (empty($category) ? '' : ' in category \"{category}\"'), $page_data);
-$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
-$this->params['seo']['h1'] = 'TEST H1';
-$this->params['seo']['description'] = 'TEST DESCRIPTION';
-$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
-$this->params['seo']['key']= 'product_list';
+//$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
+//$this->params['seo']['h1'] = 'TEST H1';
+//$this->params['seo']['description'] = 'TEST DESCRIPTION';
+//$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
+//$this->params['seo']['key']= 'product_list';
 ?>
-<div class="w_960">
-    <?php if(!empty($categories)) :?>
-    <!-- side bar with all filters -->
-    <div class="cat_p_filter_bar">
-        <div class="title">Категории</div>
-        <div class="filter_list">
-            <ul>
-            <?php foreach ($categories as $_category) :?>
-                <li><a href="<?= Url::to(['catalog/category', 'category' => $_category, 'word' => implode(' ', $keywords)])?>"><?= $_category->name?></a></li>
-            <?php endforeach?>
-            </ul>
-        </div>
-    </div>
-    <?php endif?>
-    <!-- catalog list with all item cards -->
-    <div class="cat_p_catalog_list">
-        <div class="title"><?= Yii::t('product', "Search for \"{keywords}\"". (empty($category) ? '' : ' in category "{category}"'), $page_data)?><span><?= $productProvider->totalCount ? ' ('.$productProvider->totalCount .')' : ''?></span></div>
-        <?php if (!$productProvider->count) :?>
-            <h2>По данному запросу товары не найдены.</h2><br>
-            <?php if (!empty($category)) :?>
-            <p>Показать <a href="<?= Url::to(['catalog/category', 'category' => $category])?>">все товары из категории "<?= $category->name?>"</a></p>
-            <?php endif?>
-        <?php else :?>
-            <!-- sort menu -->
-            <div class="sort_menu">
-
-                <div class="sort_price">
-                    <span>Сортировка:</span>
-                    <?= \yii\widgets\LinkSorter::widget([
-                        'sort' => $productProvider->sort,
-                        'attributes' => [
-                            'name',
-                            'price',
-                        ]
-                    ]);
-                    ?>
-                </div>
-
-                <div class="show">
-                    <!--<span>Показывать по:</span>
-                    <ul>
-                        <li><a class="active" href="#">24</a></li>
-                        <li><a href="#">48</a></li>
-                        <li><a href="#">96</a></li>
-                    </ul>-->
-                </div>
-
-                <?php if ($productProvider->totalCount > $productProvider->pagination->pageSize) :?>
-                <div class="show_pages">
-                    Страница:
-                    <?= \yii\widgets\LinkPager::widget([
-                        'pagination' => $productProvider->pagination,
-                        'options' => ['class' => 'pagination pull-right'],
-                    ]);
-                    ?>
-                </div>
-                <?php endif?>
-
-            </div>
+<nav class="bread-crumbs">
+    <?= \yii\widgets\Breadcrumbs::widget ([
+        'links' => $this->params['breadcrumbs'],
+    ])
+    ?>
-            <div class="cat_p_item_card_list">
-                <div class="novelty">
-                    <div class="content">
-                        <div class="novelty_cont">
-                            <?php foreach($productProvider->models as $product) :?>
-                                <?php require(__DIR__ .'/product_item.php')?>
-                            <?php endforeach?>
-                        </div>
-                        <?php if ($productProvider->totalCount > $productProvider->pagination->pageSize) :?>
-                            <!-- LOAD MORE BUTTON -->
-                            <!--button class="load_more_btn">Загрузить еще <?= $productProvider->pagination->pageSize?> товара</button-->
+    <div class="both"></div>
+</nav>
-                            <div class="show_pages">
-                                Страница:
-                                <?= \yii\widgets\LinkPager::widget([
-                                    'pagination' => $productProvider->pagination,
-                                    'options' => ['class' => 'pagination pull-right'],
-                                ]);
-                                ?>
-                            </div>
-                        <?php endif ?>
-                        <hr>
-
-                        <?php if(!empty($category->description)) :?>
-                            <div class="description">
-                                <?= $category->description?>
-
-                                <div class="empty_padding_400"></div>
-                            </div>
-                        <?php endif?>
-                    </div>
-                </div>
+<div class="loyout">
+    <?php if(!empty($categories)) :?>
+    <div class="leftbar">
+        <form action="#" name="filter_catalog_page_form" class="filter-catalog-form">
+            <div class="filters">
+                <div class="begin">Категории</div>
+                <ul>
+                    <?php foreach ($categories as $_category) :
+                        $checked = !empty($category) && $category->category_id == $_category->category_id;
+                        $option_url = $checked ? Url::to(['catalog/category', 'word' => implode(' ', $keywords)]) : Url::to(['catalog/category', 'category' => $_category, 'word' => implode(' ', $keywords)]);
+                        ?>
+                        <li>
+                            <input type="checkbox" class="brands-option" <?= $checked ? ' checked' : ''?> onchange="document.location='<?= $option_url?>'" />
+                            <a href="<?= $option_url?>"><?= $_category->name?><?php // @todo count?></a>
+                        </li>
+                    <?php endforeach?>
+                </ul>
             </div>
-
-        <?php endif?>
+        </form>
+    </div>
+    <?php endif?>
+    <div class="content">
+        <h1>Поиск</h1>
+        <div class="ten"></div>
+        <div class="products pn">
+            <ul>
+                <?php foreach($productProvider->models as $product) :?>
+                    <?= $this->render('/catalog/product_item.php', ['product' => $product])?>
+                <?php endforeach?>
+            </ul>
+            <div class="both"></div>
+        </div>
     </div>
-
-    <?= \common\modules\product\widgets\lastProducts::widget()?>
 </div>
 \ No newline at end of file
@@ -30,7 +30,7 @@ echo &#39;&lt;div class=&quot;home_banner_up&quot;&gt;&#39;;
 echo '</div>'
 ?>
-<?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [117,118,119,120,121]])?>
+<?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [124,125,126,127,128]])?>
 <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'promo'])?>
 <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'new'])?>
@@ -39,7 +39,7 @@ class Rubrics extends Widget {
                 continue;
             }
             $items[] = $category;[
-                'label' => $category->name ,
+                'label' => $category->name,
                 'url' => Url::to(['catalog/category', 'category' => $category]),
                 'active' => !empty($categoryObject) && $categoryObject->alias == $category->alias ? true : false,
             ];