Merge remote-tracking branch 'origin/master'

Administrator
2 parents 9f2129c6 fde39c35
Showing 30 changed files with 1001 additions and 125 deletions Show diff stats
backend/config/main.php
backend/views/category/_form.php
backend/views/category/index.php
backend/views/layouts/main-sidebar.php
common/components/artboxtree/ArtboxTreeHelper.php
common/modules/product/CatalogUrlManager.php
common/modules/product/controllers/ManageController.php
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/CategorySearch.php
common/modules/product/models/ProductSearch.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/ProductVariantSearch.php
common/modules/product/models/RemoteCategories.php
common/modules/product/models/RemoteCategoriesSearch.php
common/modules/product/models/RemoteProducts.php
common/modules/product/models/RemoteProductsSearch.php
common/modules/product/views/manage/_form.php
common/modules/product/views/manage/remote-products.php
@@ -25,6 +25,9 @@ return [
         'product' => [
             'class' => 'common\modules\product\Module'
         ],
+        'gridview' =>  [
+            'class' => '\kartik\grid\Module'
+        ]
     ],
     'components' => [
         'user' => [
@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use common\modules\file\widgets\ImageUploader;
+use kartik\select2\Select2;
 /* @var $this yii\web\View */
 /* @var $model common\modules\product\models\Category */
@@ -24,10 +25,25 @@ use common\modules\file\widgets\ImageUploader;
         ]
     ])->label(Yii::t('product', 'Parent category')) ?>
+    <?php /*
     <?= $form->field($model, 'group_to_category')->dropDownList(
         \yii\helpers\ArrayHelper::map(\common\modules\rubrication\models\TaxGroup::find()->all(), 'tax_group_id', 'name'), [
             'multiple' => true
     ])->label(Yii::t('product', 'Linked options')) ?>
+    */?>
+
+    <?= $form->field($model, 'group_to_category')->widget(Select2::className(), [
+            'data' => \yii\helpers\ArrayHelper::map(\common\modules\rubrication\models\TaxGroup::find()->all(), 'tax_group_id', 'name'),
+            'language' => 'ru',
+            'options' => [
+                'placeholder' => 'Linked options',
+                'multiple' => true,
+            ],
+            'pluginOptions' => [
+                'allowClear' => true
+            ],
+        ]
+    ) ?>
     <?= ImageUploader::widget([
         'model'=> $model,
@@ -52,6 +68,19 @@ use common\modules\file\widgets\ImageUploader;
     <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'remote_category')->widget(Select2::className(), [
+            'data' => \yii\helpers\ArrayHelper::map(\common\modules\product\models\RemoteCategories::find()->all(), 'ID', 'Name'),
+            'language' => 'ru',
+            'options' => [
+                'placeholder' => 'Select a remote category',
+                'multiple' => true,
+            ],
+            'pluginOptions' => [
+                'allowClear' => true
+            ],
+        ]
+    ) ?>
+
     <?php if (!empty($model) && $model->depth == 2) :?>
     <?= $form->field($model, 'populary')->checkbox() ?>
     <?php endif?>
 <?php
 use yii\helpers\Html;
-use yii\grid\GridView;
+use kartik\grid\GridView;
 /* @var $this yii\web\View */
 /* @var $searchModel common\modules\product\models\CategorySearch */
@@ -37,12 +37,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             ],
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => '{populary} {view} {update} {delete}',
+                'template' => '{view} {update} {delete} {populary}',
                 'buttons' => [
                     'populary' => function ($url, $model) {
-                        return Html::a('<span class="glyphicon glyphicon-star'. ($model->populary ? '' : '-empty') .'"></span>', $url, [
-                            'title' => Yii::t('product', ($model->populary ? 'Set not populary' : 'Set populary')),
-                        ]);
+                        if ($model->depth == 2) {
+                            return Html::a('<span class="glyphicon glyphicon-star' . ($model->populary ? '' : '-empty') . '"></span>', $url, [
+                                'title' => Yii::t('product', ($model->populary ? 'Set not populary' : 'Set populary')),
+                            ]);
+                        }
                     },
                 ],
                 'urlCreator' => function ($action, $model, $key, $index) {
@@ -63,5 +65,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 }
             ],
         ],
+        'panel' => [
+            'type'=>'success',
+        ],
     ]); ?>
 </div>
@@ -30,6 +30,7 @@ use yii\widgets\Menu;
                     'url' => ['/product/manage'],
                     'items' => [
                         ['label' => 'Товары', 'url' => ['/product/manage']],
+                        ['label' => 'Импорт товаров', 'url' => ['/product/manage/import']],
                         ['label' => 'Категории', 'url' => ['/category']],
                         ['label' => 'Бренды', 'url' => ['/brand']],
                     ]
@@ -15,6 +15,23 @@ class ArtboxTreeHelper extends Object {
         return $result;
     }
+    public static function setArrayField($path, $as_string = false) {
+        if (is_array($path)) {
+            if ($as_string) {
+                foreach ($path as &$item) {
+                    $item = "'$item'";
+                }
+            }
+            $path = implode(',', $path);
+        }
+        return '{'. $path .'}';
+    }
+
+    public static function getArrayField($path) {
+        $path = trim($path, '{}');
+        return empty($path) ? [] : explode(',', $path);
+    }
+
     protected static function _recursiveTreeMap(&$result, $tree, $from, $to, $symbol = '&ndash;') {
         foreach ($tree as $item) {
             $element = $item['item'];
@@ -41,8 +41,8 @@ class CatalogUrlManager implements UrlRuleInterface {
                 }
                 $params['category'] = $category;
             }
-            // Filter
             if (!empty($paths[2])) {
+                // Filter
                 if (strpos($paths[2], 'filter:') === 0) {
                     $params['filter'] = [];
                     $filter_str = substr($paths[2], 7);
@@ -65,6 +65,8 @@ class CatalogUrlManager implements UrlRuleInterface {
                         }
                     }
+                } elseif (strpos($paths[2], 'word:') === 0) {
+                    $params['word'] = substr($paths[2], 5);
                 }
             }
         } elseif ($paths[0] == 'product') {
@@ -99,8 +101,17 @@ class CatalogUrlManager implements UrlRuleInterface {
             case 'catalog/category':
                 if (!empty($params['category'])) {
                     $category_alias = is_object($params['category']) ? $params['category']->alias : strtolower($params['category']);
+                    $url = 'catalog/'. $category_alias .'/';
+                } else {
+                    $url = 'catalog/';
+                }
+
+                if (!empty($params['word'])) {
+                    if (!is_array($params['word'])) {
+                        $params['word'] = [$params['word']];
+                    }
+                    $url .= 'word:'. implode(';', $params['word']);
                 }
-                $url = 'catalog/'. $category_alias .'/';
                 $filter = [];
                 if (!empty($params['filter'])) {
@@ -135,6 +146,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                     }
                     $url .= 'filter:'. implode(';', $filter);
                 }
+
                 return $url;
                 break;
@@ -5,6 +5,7 @@ namespace common\modules\product\controllers;
 use common\modules\product\helpers\ProductHelper;
 use common\modules\product\models\Category;
 use common\modules\product\models\ProductVariant;
+use common\modules\product\models\RemoteProductsSearch;
 use Yii;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductSearch;
@@ -162,6 +163,16 @@ class ManageController extends Controller
         return $this->redirect(['index']);
     }
+    public function actionImport() {
+        $searchModel = new RemoteProductsSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('remote-products', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
     /**
      * Finds the Product model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
@@ -4,7 +4,9 @@ namespace common\modules\product\helpers;
 use common\modules\product\models\Brand;
 use common\modules\product\models\Category;
+use common\modules\product\models\Product;
 use yii\base\Object;
+use Yii;
 class ProductHelper extends Object {
     public static function getCategories() {
@@ -55,4 +57,20 @@ class ProductHelper extends Object {
         }
         return $result;
     }
+
+    public static function addLastProsucts($product_id) {
+        $last_products = self::getLastProducts();
+        if (!in_array($product_id, $last_products)) {
+            $last_products[] = $product_id;
+            Yii::$app->session->set('last_products', $last_products);
+        }
+    }
+
+    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();
+        }
+        return $last_products;
+    }
 }
 \ No newline at end of file
@@ -73,7 +73,7 @@ class BrandSearch extends Brand
         return $dataProvider;
     }
-    public function getBrands($category, $params) {
+    public function getBrands($category = null, $params = []) {
         $query = Brand::find()
             ->select([
                 Brand::tableName() .'.*',
@@ -82,11 +82,13 @@ class BrandSearch extends Brand
             ->innerJoin(Product::tableName(), Product::tableName() .'.brand_id='. Brand::tableName() .'.brand_id')
             ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id')
-            ->with('brandName')
-            ->where([
+            ->with('brandName');
+        if (!empty($category)) {
+            $query->where([
                 ProductCategory::tableName() .'.category_id' => $category->category_id
-            ])
-            ->groupBy(Brand::tableName() .'.brand_id');
+            ]);
+        }
+        $query->groupBy(Brand::tableName() .'.brand_id');
         if (isset($params['options'])) {
             unset($params['options']);
         }
@@ -4,6 +4,7 @@ namespace common\modules\product\models;
 use common\behaviors\RuSlug;
 use common\components\artboxtree\ArtboxTreeBehavior;
+use common\components\artboxtree\ArtboxTreeHelper;
 use common\modules\relation\relationBehavior;
 use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
 use Yii;
@@ -12,6 +13,7 @@ use Yii;
  * This is the model class for table "category".
  *
  * @property integer $category_id
+ * @property string $remote_id
  * @property integer $parent_id
  * @property string $path
  * @property integer $depth
@@ -86,7 +88,7 @@ class Category extends \yii\db\ActiveRecord
             [['meta_robots'], 'string', 'max' => 50],
             [['alias', 'name'], 'string', 'max' => 250],
             [['populary'], 'boolean'],
-            [['group_to_category'], 'safe'],
+            [['group_to_category', 'remote_category'], 'safe'],
             [['category_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => CategoryName::className(), 'targetAttribute' => ['category_name_id' => 'category_name_id']],
             // [['image'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif'],
 //            [['product_unit_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductUnit::className(), 'targetAttribute' => ['product_unit_id' => 'product_unit_id']],
@@ -112,6 +114,7 @@ class Category extends \yii\db\ActiveRecord
             'alias' => Yii::t('product', 'Alias'),
             'populary' => Yii::t('product', 'Populary'),
             'name' => Yii::t('product', 'Name'),
+            'remote_id' => Yii::t('product', 'Remote ID'),
         ];
     }
@@ -147,15 +150,14 @@ class Category extends \yii\db\ActiveRecord
         return $this->getRelations('tax_group_to_category');
     }
-    public function beforeSave($insert)
-    {
-        if (parent::beforeSave($insert)) {
+    public function getRemote_category() {
+        return ArtboxTreeHelper::getArrayField($this->remote_id);
+    }
-            if (empty($this->parent_id))
-                $this->parent_id = 0;
-            return true;
+    public function setRemote_category($value) {
+        if (!empty($value) && is_array($value)) {
+            $this->remote_id = ArtboxTreeHelper::setArrayField($value, false);
         }
-        return false;
     }
     public function getCategoryName() {
@@ -165,4 +167,16 @@ class Category extends \yii\db\ActiveRecord
     public function getName() {
         return empty($this->categoryName) ? null : $this->categoryName->value;
     }
+
+    public function beforeSave($insert)
+    {
+        if (parent::beforeSave($insert)) {
+
+            if (empty($this->parent_id))
+                $this->parent_id = 0;
+
+            return true;
+        }
+        return false;
+    }
 }
@@ -2,6 +2,7 @@
 namespace common\modules\product\models;
+use common\components\artboxtree\ArtboxTreeHelper;
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
@@ -97,4 +98,19 @@ class CategorySearch extends Category
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+
+    public static function findByRemoteID($id) {
+        /** @var CategoryQuery $query */
+        $query = Category::find()
+            ->with('categoryName')
+            ->andFilterWhere(['@>', 'remote_id', ArtboxTreeHelper::setArrayField($id)]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        }
+        return null;
+    }
+
+//    public static function findByProductsKeywords($keywords = [], $category = null) {
+//
+//    }
 }
@@ -80,4 +80,13 @@ class ProductSearch extends Product
         }
     }
+    public static function findByRemoteID($id) {
+        /** @var CategoryQuery $query */
+        $query = Product::find()
+            ->andFilterWhere(['remote_id' => $id]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        }
+        return null;
+    }
 }
@@ -10,6 +10,7 @@ use Yii;
  * @property integer $product_variant_id
  * @property integer $product_id
  * @property string $name
+ * @property string $remote_id
  * @property string $sku
  * @property double $price
  * @property double $price_old
@@ -34,10 +35,11 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['product_id', 'name', 'sku', 'product_unit_id'], 'required'],
+            [['product_id', 'sku', 'product_unit_id'], 'required'],
             [['product_id', 'product_unit_id'], 'integer'],
             [['price', 'price_old', 'stock'], 'number'],
             [['name', 'sku'], 'string', 'max' => 255],
+            [['remote_id'], 'string', 'max' => 20],
             [['product_unit_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductUnit::className(), 'targetAttribute' => ['product_unit_id' => 'product_unit_id']],
         ];
     }
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use yii\web\NotFoundHttpException;
+
+/**
+ * ProductVariantSearch represents the model behind the search form about `common\modules\product\models\ProductVariant`.
+ */
+class ProductVariantSearch extends ProductVariant
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'sku', 'price', 'price_old', 'stock'], 'safe'],
+            [['product_variant_id', 'product_id'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Product::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'product_variant_id' => $this->product_variant_id,
+            'product_id' => $this->product_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+              ->andFilterWhere(['like', 'sku', $this->sku]);
+
+        return $dataProvider;
+    }
+
+    public static function findBySku($sku) {
+        /** @var ProductQuery $query */
+        $query = ProductVariant::find()
+                ->andFilterWhere(['sku' => $sku]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        }
+        return;
+    }
+
+    public static function findByRemoteID($id) {
+        /** @var CategoryQuery $query */
+        $query = ProductVariant::find()
+            ->andFilterWhere(['remote_id' => $id]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        }
+        return;
+    }
+}
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "remote_categories".
+ *
+ * @property string $Name
+ * @property string $ID_chief
+ * @property string $ID
+ */
+class RemoteCategories extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'remote_categories';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['Name'], 'string', 'max' => 100],
+            [['ID_chief', 'ID'], 'string', 'max' => 20],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'Name' => Yii::t('product', 'Name'),
+            'ID_chief' => Yii::t('product', 'Id Chief'),
+            'ID' => Yii::t('product', 'ID'),
+        ];
+    }
+
+    public function getCategory() {
+        if (empty($this->ID)) {
+            return null;
+        }
+        return CategorySearch::findByRemoteID($this->ID);
+    }
+
+    public static function findByID($id) {
+        /** @var CategoryQuery $query */
+        $query = RemoteCategories::find()
+            ->andFilterWhere(['ID' => $id]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        }
+        return null;
+    }
+}
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\modules\product\models\RemoteCategories;
+
+/**
+ * RemoteCategoriesSearch represents the model behind the search form about `common\modules\product\models\RemoteCategories`.
+ */
+class RemoteCategoriesSearch extends RemoteCategories
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['Name', 'ID_chief', 'ID'], 'safe'],
+            [['local_id'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = RemoteCategories::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'local_id' => $this->local_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'Name', $this->Name])
+            ->andFilterWhere(['like', 'ID_chief', $this->ID_chief])
+            ->andFilterWhere(['like', 'ID', $this->ID]);
+
+        return $dataProvider;
+    }
+}
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "remote_products".
+ *
+ * @property string $Name
+ * @property string $Price
+ * @property string $Price_old
+ * @property string $ID_chief
+ * @property string $Article
+ * @property string $Brand
+ * @property string $ID
+ * @property string $Date_create
+ * @property integer $local_id
+ * @property ProductVariant $product
+ * @property RemoteCategories $remoteCategory
+ */
+class RemoteProducts extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'remote_products';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['Price', 'Price_old'], 'number'],
+            [['Date_create'], 'safe'],
+            [['Name'], 'string', 'max' => 100],
+            [['ID_chief', 'Article', 'ID'], 'string', 'max' => 20],
+            [['Brand'], 'string', 'max' => 25],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'Name' => Yii::t('product', 'Name'),
+            'Price' => Yii::t('product', 'Price'),
+            'Price_old' => Yii::t('product', 'Price Old'),
+            'ID_chief' => Yii::t('product', 'Id Chief'),
+            'Article' => Yii::t('product', 'Article'),
+            'Brand' => Yii::t('product', 'Brand'),
+            'ID' => Yii::t('product', 'ID'),
+            'Date_create' => Yii::t('product', 'Date Create'),
+            'local_id' => Yii::t('product', 'Local ID'),
+        ];
+    }
+
+    public function getRemoteCategory() {
+        if (empty($this->ID_chief)) {
+            return null;
+        }
+        return RemoteCategories::findByID($this->ID_chief);
+    }
+
+    public function getProduct() {
+        if (empty($this->ID)) {
+            return null;
+        }
+        return ProductVariantSearch::findByRemoteID($this->ID);
+    }
+}
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\modules\product\models\RemoteProducts;
+
+/**
+ * RemoteProductsSearch represents the model behind the search form about `common\modules\product\models\RemoteProducts`.
+ */
+class RemoteProductsSearch extends RemoteProducts
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['Name', 'ID_chief', 'Article', 'Brand', 'ID', 'Date_create'], 'safe'],
+            [['Price', 'Price_old'], 'number'],
+            [['local_id'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = RemoteProducts::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'Price' => $this->Price,
+            'Price_old' => $this->Price_old,
+            'Date_create' => $this->Date_create,
+            'local_id' => $this->local_id,
+        ]);
+
+        $query->andFilterWhere(['like', 'Name', $this->Name])
+            ->andFilterWhere(['like', 'ID_chief', $this->ID_chief])
+            ->andFilterWhere(['like', 'Article', $this->Article])
+            ->andFilterWhere(['like', 'Brand', $this->Brand])
+            ->andFilterWhere(['like', 'ID', $this->ID]);
+
+        return $dataProvider;
+    }
+}
@@ -8,6 +8,7 @@ use common\modules\product\helpers\ProductHelper;
 use kartik\file\FileInput;
 use unclead\widgets\MultipleInput;
 use unclead\widgets\MultipleInputColumn;
+use kartik\select2\Select2;
 /* @var $this yii\web\View */
 /* @var $model common\modules\product\models\Product */
@@ -30,9 +31,9 @@ use unclead\widgets\MultipleInputColumn;
         ]
     ) ?>
-    <?= $form->field($model, 'categories')->widget(\kartik\select2\Select2::className(), [
+    <?= $form->field($model, 'categories')->widget(Select2::className(), [
             'data' => ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
-            'language' => 'de',
+            'language' => 'ru',
             'options' => [
                 'placeholder' => 'Select a state ...',
                 'multiple' => true,
+<?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>
@@ -5,4 +5,7 @@ return [
     'Name' => 'Наименование',
     'Set populary' => 'Сделать популярной',
     'Set not populary' => 'Сделать не популярной',
+    'Remote ID' => 'ID в 1С',
+    'Search for "{keywords}"' => 'Поиск по "{keywords}"',
+    'Search for "{keywords}" in category "{category}"' => 'Поиск по "{keywords}" в категории "{category}"',
 ];
 \ No newline at end of file
+<?php
+
+namespace console\controllers;
+
+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\console\Controller;
+use yii\helpers\Console;
+
+class ImportController extends Controller {
+
+    public function actionIndex($section) {
+        $method = 'go'. ucfirst(strtolower($section));
+        if (!method_exists($this, $method)) {
+            print $this->stdout("What is $section?\n");
+            return Controller::EXIT_CODE_ERROR;
+        }
+
+        $this->$method();
+
+        return Controller::EXIT_CODE_NORMAL;
+    }
+
+    public function goGo() {
+        $new_products = $linked_products = 0;
+        foreach(RemoteProducts::find()->all() as $product) {
+            if (!empty($product->product->product_id)) {
+                $linked_products++;
+
+                $_productVariant = ProductVariant::findOne($product->product->product_id);
+                $_product = Product::findOne($_productVariant->product_id);
+
+                if (
+                $_product->name != $product->Name ||
+                $_product->categories != [$product->remoteCategory->category->category_id] ||
+                ($product->Brand && ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null && $_product->brand_id != $brand->brand_id)
+                ) {
+                    $_product->name = $product->Name;
+                    $_product->categories = [$product->remoteCategory->category->category_id];
+                    if ( $product->Brand ) {
+                        if ( ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null ) {
+                            $_product->brand_id = $brand->brand_id;
+                        } else {
+                            // Create brand
+                            $brand = new Brand();
+                            $brand->name = trim($product->Brand);
+                            $brand->save();
+                            $_product->brand_id = $brand->brand_id;
+                        }
+                    }
+                    $_product->save();
+                }
+
+                if (
+                $_productVariant->price != floatval($product->Price) ||
+                $_productVariant->price_old != floatval($product->Price_old) ||
+                (!empty($product->Article) && $_productVariant->sku != $product->Article)
+                ) {
+                    $_productVariant->price = floatval($product->Price);
+                    $_productVariant->price_old = floatval($product->Price_old);
+                    $_productVariant->sku = empty($product->Article) ? uniqid('gds_') : $product->Article;
+                    if (!$_productVariant->price) {
+                        $_productVariant->stock = 0;
+                    }
+                    $_productVariant->save();
+                }
+            } elseif (!empty($product->remoteCategory) && !empty($product->remoteCategory->category) && !empty($product->remoteCategory->category->category_id)) {
+                $new_products++;
+
+                $_product = new Product();
+                $_productVariant = new ProductVariant();
+                $_product->name = $product->Name;
+                $_product->categories = [$product->remoteCategory->category->category_id];
+
+                if ( $product->Brand ) {
+                    if ( ($brand = BrandName::find()->filterWhere(['like', 'value', trim($product->Brand)])->one()) !== null ) {
+                        $_product->brand_id = $brand->brand_id;
+                    } else {
+                        // Create brand
+                        $brand = new Brand();
+                        $brand->name = trim($product->Brand);
+                        $brand->save();
+                        $_product->brand_id = $brand->brand_id;
+                    }
+                }
+
+                $_productVariant->price = floatval($product->Price);
+                $_productVariant->price_old = floatval($product->Price_old);
+                $_productVariant->sku = empty($product->Article) ? uniqid('gds_') : $product->Article;
+                $_productVariant->product_unit_id = 1;
+                $_productVariant->remote_id = $product->ID;
+                $_productVariant->stock = $_productVariant->price > 0 ? null : 0;
+
+                if (!$_product->save()) {
+                    print $this->stdout("Saved error for the {$_product->name} {$_product->product_id}?\n");
+                    return Controller::EXIT_CODE_ERROR;
+                }
+
+                $_productVariant->product_id = $_product->product_id;
+                if (!$_productVariant->save()) {
+                    print $this->stdout("Saved error for variant of the {$_product->name} {$_product->product_id}?\n");
+                    return Controller::EXIT_CODE_ERROR;
+                }
+            }
+        }
+
+        $this->goStat();
+    }
+
+    public function goStat() {
+        $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 .")\n";
+                    }
+                }
+                $orpahed_products++;
+            }
+            $all_products++;
+        }
+
+        $this->stdout("Всего $all_products товаров, $new_products новых и $linked_products уже связанных.\n");
+        if (!empty($not_linked_cats)) {
+            $this->stdout("$orpahed_products товаров не привязаны к категориям:\n");
+            foreach ($not_linked_cats as $not_linked_cat) {
+                $this->stdout("$not_linked_cat");
+            }
+        }
+    }
+
+    public function goProducts() {
+
+    }
+}
 \ No newline at end of file
@@ -3,6 +3,7 @@
 namespace frontend\controllers;
 use common\modules\product\Filter;
+use common\modules\product\helpers\ProductHelper;
 use common\modules\rubrication\models\TaxOptionSearch;
 use frontend\models\ProductFrontendSearch;
 use Yii;
@@ -27,7 +28,7 @@ use yii\web\HttpException;
 class CatalogController extends \yii\web\Controller
 {
     public function actionSearch() {
-
+        // @todo
     }
     public function actionCategory()
@@ -35,15 +36,54 @@ class CatalogController extends \yii\web\Controller
         /** @var Category $category */
         $category = Yii::$app->request->get('category');
         $filter = Yii::$app->request->get('filter', []);
+        $word = trim(Yii::$app->request->get('word', ''));
-        if (empty($category->category_id)) {
+        if (empty($category->category_id) && empty($word)) {
             throw new HttpException(404 ,'Page not found');
         }
-        if ($category->depth < 2) {
+
+        $last_products = ProductHelper::getLastProducts(true);
+
+        if (!empty($word)) {
+            $params = [];
+
+            $params['keywords'] = explode(' ', preg_replace("|[\s,.!:&?~();-]|i", " ", $word));
+            foreach($params['keywords'] as $i => &$keyword) {
+                $keyword = trim($keyword);
+                if (empty($keyword)) {
+                    unset($params['keywords'][$i]);
+                }
+            }
+
+            $productModel = new ProductFrontendSearch();
+            $productProvider = $productModel->search($category, $params);
+
+            $categoriesQuery = Category::find()
+                ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.category_id = '. Category::tableName() .'.category_id')
+                ->innerJoin(Product::tableName(), Product::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id');
+            foreach ($params['keywords'] as $keyword) {
+                $categoriesQuery->andWhere(['ilike', 'product.name', $keyword]);
+            }
+            $categories = $categoriesQuery->all();
+
+            return $this->render(
+                'search',
+                [
+                    'keywords'          => $params['keywords'],
+                    'category'          => $category,
+                    'productModel'      => $productModel,
+                    'productProvider'   => $productProvider,
+                    'last_products'     => $last_products,
+                    'categories'        => $categories,
+                ]
+            );
+
+        } elseif ($category->depth < 2) {
             return $this->render(
                 'categories',
                 [
-                    'category' => $category
+                    'category' => $category,
+                    'last_products' => $last_products,
                 ]
             );
         } else {
@@ -113,6 +153,7 @@ class CatalogController extends \yii\web\Controller
                     'optionsProvider'   => $optionsProvider,
                     'groups'            => $groups,
                     'priceLimits'       => $priceLimits,
+                    'last_products'     => $last_products,
                 ]
             );
         }
@@ -134,9 +175,13 @@ class CatalogController extends \yii\web\Controller
                 unset($groups[$i]);
         }
+        $last_products = ProductHelper::getLastProducts(true);
+        ProductHelper::addLastProsucts($product->product_id);
+
         return $this->render('product', [
             'product' => $product,
             'properties' => $groups,
+            'last_products' => $last_products
         ]);
     }
@@ -5,6 +5,7 @@ namespace frontend\models;
 use common\modules\product\models\Brand;
 use common\modules\product\models\ProductCategory;
 use common\modules\product\models\ProductOption;
+use common\modules\product\models\ProductSearch;
 use common\modules\rubrication\models\TaxGroup;
 use common\modules\rubrication\models\TaxOption;
 use Yii;
@@ -43,14 +44,17 @@ class ProductFrontendSearch extends Product {
      *
      * @return ActiveDataProvider
      */
-    public function search($category, $params) {
-        /** @var ActiveQuery $query */
-        $query = $category->getRelations('product_categories');
-
+    public function search($category = null, $params = []) {
+        if (!empty($category)) {
+            /** @var ActiveQuery $query */
+            $query = $category->getRelations('product_categories');
+        } else {
+            $query = Product::find();
+        }
         $query->joinWith('variant');
         $query->joinWith('brand');
-        $query->joinWith('categories');
         $query->joinWith('image');
+        $query->joinWith('categories');
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
@@ -84,7 +88,7 @@ class ProductFrontendSearch extends Product {
         return $dataProvider;
     }
-    public function optionsForCategory($category, $params) {
+    public function optionsForCategory($category = null, $params = []) {
         $query = TaxOption::find()
             ->select([
                 TaxOption::tableName() .'.*',
@@ -93,11 +97,11 @@ class ProductFrontendSearch extends Product {
             ->innerJoin(ProductOption::tableName(), ProductOption::tableName() .'.option_id='. TaxOption::tableName() .'.tax_option_id')
             ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. ProductOption::tableName() .'.product_id')
             ->innerJoin(TaxGroup::tableName(), TaxGroup::tableName() .'.tax_group_id='. TaxOption::tableName() .'.tax_group_id')
-            ->where([
-                TaxGroup::tableName() .'.is_filter' => true,
-                ProductCategory::tableName() .'.category_id' => $category->category_id
-            ])
-            ->groupBy(TaxOption::tableName() .'.tax_option_id');
+            ->andWhere([TaxGroup::tableName() .'.is_filter' => true]);
+        if (!empty($category)) {
+            $query->andWhere([ProductCategory::tableName() .'.category_id' => $category->category_id]);
+        }
+        $query->groupBy(TaxOption::tableName() .'.tax_option_id');
         if (!empty($params['prices'])) {
             if ($params['prices']['min'] > 0 || $params['prices']['max'] > 0) {
@@ -122,9 +126,13 @@ class ProductFrontendSearch extends Product {
         return $dataProvider;
     }
-    public function priceLimits($category, $params) {
-        /** @var ActiveQuery $query */
-        $query = $category->getRelations('product_categories');
+    public function priceLimits($category = null, $params = []) {
+        if (!empty($category)) {
+            /** @var ActiveQuery $query */
+            $query = $category->getRelations('product_categories');
+        } else {
+            $query = Product::find();
+        }
         $query->joinWith('variant');
         $this->_setParams($query, $params, false);
@@ -141,6 +149,14 @@ class ProductFrontendSearch extends Product {
     }
     protected function _setParams(&$query, $params, $setPriceLimits = true) {
+        if (!empty($params['keywords'])) {
+            if (!is_array($params['keywords'])) {
+                $params['keywords'] = [$params['keywords']];
+            }
+            foreach ($params['keywords'] as $keyword) {
+                $query->andFilterWhere(['ilike', Product::tableName() .'.name', $keyword]);
+            }
+        }
         if (!empty($params['brands'])) {
             $query->andFilterWhere([Product::tableName() .'.brand_id' => $params['brands']]);
         }
 <?php
 /** @var $this \yii\web\View */
 /** @var $dataProvider \yii\data\ActiveDataProvider */
-die('here1');
 $this->title = $product->name;
 foreach($product->category->getParents()->all() as $parent) {
     $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
@@ -50,13 +49,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
     <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 ? ' есть в наличии' : ' нет в наличии'?></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">
-                <div class="price"><?= $product->variant->price?></div>
+                <?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">
@@ -214,23 +219,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
                 <div class="ionTabs__item" data-name="Tab_2_name">
                     <?= $product->description?>
                 </div>
-                <?php else :?>
-                <div class="ionTabs__item" data-name="Tab_2_name">
-                    Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna.
-                </div>
                 <?php endif?>
                 <?php if (!empty($product->video)) :?>
                 <div class="ionTabs__item" data-name="Tab_3_name">
                     <?= $product->video?>
                 </div>
-                <?php else :?>
-                <div class="ionTabs__item" data-name="Tab_3_name" style="width: 100%; text-align: center">
-                    <div style="clear: both;width: 100%;"><iframe width="420" height="315" src="https://www.youtube.com/embed/Q5LiO_35s1E" frameborder="0" allowfullscreen></iframe></div>
-                </div>
                 <?php endif?>
-                <!--<div class="ionTabs__item" data-name="Tab_4_name">
-                    <span class="tabs_item_name">Отзывы</span>
-                </div>-->
                 <div class="ionTabs__preloader"></div>
             </div>
@@ -239,77 +233,16 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
     </div> <!-- конец табов с описанием видео и отзывами -->
     <div style="clear: both;"></div>
-
+    <?php if(!empty($last_products)) :?>
     <hr>
-
     <div class="watched_block">
         <h1>Вы недавно просматривали</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>
-                <a href="#" class="test_a">
-                    <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
-                </a>
-                <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>
-                <a href="#" class="test_a">
-                    <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
-                </a>
-                <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>
-                <a href="#" class="test_a">
-                    <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
-                </a>
-                <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>
-                <a href="#" class="test_a">
-                    <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
-                </a>
-                <a href="#" class="compare_add_but_d">
-                    <img src="/images/ico_scales.png" alt=""><span>добавить к сравнению</span>
-                </a>
-                <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
-            </div>
-
+            <?php foreach($last_products as $product) :?>
+            <?php require(__DIR__ .'/product_smart.php')?>
+            <?php endforeach?>
         </div>
-
     </div>
+    <?php endif?>
 </div> <!-- end flex container -->
@@ -14,7 +14,9 @@
         <?php endif?>
         </div>
         <div class="title_item"><?= $product->name?></div></a>
+    <?php if (!empty($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>
+<?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
@@ -7,12 +7,12 @@
 use yii\helpers\Url;
 use common\modules\product\helpers\ProductHelper;
-
-$this->title = $category->categoryName->value;
+$this->title =  $category->categoryName->value;
 foreach($category->getParents()->all() as $parent) {
     $this->params['breadcrumbs'][] = ['label' => $parent->categoryName->value, 'url' => ['catalog/category', 'category' => $parent]];
 }
 $this->params['breadcrumbs'][] = $category->categoryName->value;
+
 $this->params['seo']['seo_text'] = 'TEST SEO TEXT';
 $this->params['seo']['h1'] = 'TEST H1';
 $this->params['seo']['description'] = 'TEST DESCRIPTION';
@@ -147,10 +147,11 @@ $filterWhitoutPrice[&#39;prices&#39;] = [
     <!-- catalog list with all item cards -->
     <div class="cat_p_catalog_list">
         <div class="title"><?= $category->categoryName->value?> <span>(<?= $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->categoryName->value?>"</a></p>
+            <?php endif?>
         <?php else :?>
             <!-- sort menu -->
             <div class="sort_menu">
@@ -235,4 +236,16 @@ $filterWhitoutPrice[&#39;prices&#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?>
 </div>
 \ No newline at end of file
+<?php
+/** @var $this \yii\web\View */
+/** @var $productProvider \yii\data\ActiveDataProvider */
+/** @var $brandProvider \yii\data\ActiveDataProvider */
+
+
+use yii\helpers\Url;
+use common\modules\product\helpers\ProductHelper;
+
+$page_data = [
+    'keywords' => implode(' ', $keywords),
+];
+
+if (!empty($category)) {
+    $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';
+?>
+<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>
+
+            <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="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>
+
+        <?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?>
+</div>
 \ No newline at end of file
@@ -58,7 +58,7 @@ AppAsset::register($this);
         <?= Html::a(Html::img('/images/bau_logo.png',['border'=>'0']), ['/'],['class'=>'head_up_cell bau_logo'])?>
         <div class="head_up_cell srch">
             <div class="search_head">
-                <form action="<?= Url::to('catalog')?>">
+                <form action="/<?= Url::to('catalog')?>">
                     <div class="srch_head_desc">Введите запрос  <a href="#" onclick="$('#search-head').val('Шифер');return false;">Шифер</a>   <a href="#" onclick="$('#search-head').val('Рубероид');return false;">Рубероид</a></div>
                     <input type="text" name="word" id="search-head">
                     <button><div class="search_img"></div></button>