diff --git a/.htaccess b/.htaccess
index a08ebbb..026c6cd 100755
--- a/.htaccess
+++ b/.htaccess
@@ -13,7 +13,6 @@ AddDefaultCharset utf-8
     RewriteBase /
     # deal with admin first
 
-
   Redirect 301 /Kak_vibrat_ryuksak        /
   Redirect 301 /products/ryukzaki          /catalog/ryukzaki
   Redirect 301 /products/koshel_ki        /catalog/koshelki
@@ -90,10 +89,8 @@ AddDefaultCharset utf-8
     RewriteCond %{THE_REQUEST} \s/+(.+?)/+[?\s]
     RewriteRule /$ /%1 [R,L]
 
-
-
-#      RewriteCond %{HTTP_HOST} ^([^www].*)$
-#      RewriteRule ^(.*)$  http://www.%1/$1 [R=301]
+      RewriteCond %{HTTP_HOST} ^([^www].*)$
+      RewriteRule ^(.*)$  http://www.%1/$1 [R=301]
 
 </IfModule>
 
diff --git a/backend/controllers/EventController.php b/backend/controllers/EventController.php
index 49cbd6f..3e09590 100755
--- a/backend/controllers/EventController.php
+++ b/backend/controllers/EventController.php
@@ -161,6 +161,7 @@ class EventController extends Controller
 
     public function actionDelimg($id,$field){
         $model = $this->findModel($id);
+        $model->detachBehavior('img');
         $model->$field = '';
         $model->save();
         return true;
diff --git a/common/models/Event.php b/common/models/Event.php
index 7b8317b..11a12f7 100755
--- a/common/models/Event.php
+++ b/common/models/Event.php
@@ -47,7 +47,7 @@ class Event extends \yii\db\ActiveRecord
     public function behaviors()
     {
         return [
-            [
+            'img'=>[
                 'class'     => SaveImgBehavior::className(),
                 'fields' => [
                     ['name'=>'imageUpload','directory' => 'event' ],
diff --git a/common/modules/product/CatalogUrlManager.php b/common/modules/product/CatalogUrlManager.php
index 227b497..a618211 100755
--- a/common/modules/product/CatalogUrlManager.php
+++ b/common/modules/product/CatalogUrlManager.php
@@ -2,10 +2,12 @@
 
 namespace common\modules\product;
 
-
+use common\modules\product\helpers\FilterHelper;
+use common\modules\product\models\Brand;
+use common\modules\product\models\BrandSearch;
 use common\modules\product\models\CategorySearch;
 use common\modules\product\models\ProductSearch;
-
+use common\modules\rubrication\models\TaxOption;
 use Yii;
 use yii\helpers\Url;
 use yii\web\HttpException;
@@ -13,6 +15,8 @@ use yii\web\UrlRuleInterface;
 
 class CatalogUrlManager implements UrlRuleInterface {
     public $route_map = [];
+
+    public $option_prefix = 'o:';
     /**
      * Parses the given request and returns the corresponding route and parameters.
      * @param \yii\web\UrlManager $manager the URL manager
@@ -25,12 +29,6 @@ class CatalogUrlManager implements UrlRuleInterface {
         $pathInfo = $request->getPathInfo();
         $paths = explode('/', $pathInfo);
 
-        if(isset($paths[1])) {
-            if(strripos($request->url,'catalog/'.$paths[1].'?') && (!strripos($request->url,'?page')) && (!strripos($request->url,'?sort'))){
-                throw new HttpException(404 ,'Page not found');
-            }
-
-        }
 
 
         if (!array_key_exists($paths[0], $this->route_map)) {
@@ -56,6 +54,24 @@ class CatalogUrlManager implements UrlRuleInterface {
                     $this->parseFilter($paths[2], $params);
 
                 }
+                else if(strpos($paths[2], 'filter:') === 0){
+                    $this->parseOldFilter($paths[2], $params);
+                    //['catalog/category', 'category' => $category, 'filters' =>$params['filter']]
+
+                    $optionsTemplate = FilterHelper::optionsTemplate();
+                    array_unshift($optionsTemplate, "special", "brands");
+                    $filterView = [];
+                    foreach($optionsTemplate as $optionKey){
+                        if(isset($params['filter'][$optionKey])){
+                            $filterView[$optionKey] = $params['filter'][$optionKey];
+                        }
+
+
+                    }
+
+
+                    Yii::$app->response->redirect(['catalog/category', 'category' => $category, 'filters' =>$filterView],301);
+                }
                 else {
                     throw new HttpException(404 ,'Page not found');
                 }
@@ -95,7 +111,6 @@ class CatalogUrlManager implements UrlRuleInterface {
                 if (!empty($params['category'])) {
                     $category_alias = is_object($params['category']) ? $params['category']->alias : strtolower($params['category']);
                     $url = 'catalog/'. $category_alias .'/';
-                    unset($params['category']);
                 } else {
                     $url = 'catalog/';
                 }
@@ -118,7 +133,6 @@ class CatalogUrlManager implements UrlRuleInterface {
             case 'catalog/product':
                 if (!empty($params['product'])) {
                     $product_alias = is_object($params['product']) ? $params['product']->alias : strtolower($params['product']);
-                    unset($params['product']);
                 }
                 $url = 'product/'. $product_alias;
 
@@ -131,6 +145,23 @@ class CatalogUrlManager implements UrlRuleInterface {
                 return $url;
                 break;
 
+//            case 'catalog/brands':
+//                if (empty($params['brand'])) {
+//                    return 'brands';
+//                } else {
+//
+//                    $brand_alias = is_object($params['brand']) ? $params['brand']->alias : strtolower($params['brand']);
+//                }
+//                $url = 'brands/'. $brand_alias .'/';
+//
+//                $this->setFilterUrl($params, $url);
+//
+//                if (!empty($params) && ($query = http_build_query($params)) !== '') {
+//                    $url .= '?' . $query;
+//                }
+//
+//                return $url;
+//                break;
         }
     }
 
@@ -173,18 +204,51 @@ class CatalogUrlManager implements UrlRuleInterface {
             if (empty($filter_option)) {
                 continue;
             }
+            $filter_exp = explode('=', $filter_option);
+
+            if(isset($filter_exp[1])){
+                list($filter_key, $filter_option) = explode('=', $filter_option);
+                if($filter_key == 'prices') { // price-interval section
+                    $prices = explode(':', $filter_option);
+                    $params['filters'][$filter_key] = [
+                        'min' => floatval($prices[0]),
+                        'max' => floatval($prices[1]),
+                    ];
+                }
+                else { // brands and other sections
+                    $params['filters'][$filter_key] = explode(',', $filter_option);
+                }
+            } else {
+                throw new HttpException(404 ,'Page not found');
+            }
+
+        }
+    }
+
+
+
+    private function parseOldFilter($paths, &$params) {
+        $params['filter'] = [];
+        $filter_str = substr($paths, 7);
+        $filter_options = explode(';', $filter_str);
+        foreach ($filter_options as $filter_option) {
+            if (empty($filter_option)) {
+                continue;
+            }
             list($filter_key, $filter_option) = explode('=', $filter_option);
             if($filter_key == 'prices') { // price-interval section
                 $prices = explode(':', $filter_option);
-                $params['filters'][$filter_key] = [
+                $params['filter'][$filter_key] = [
                     'min' => floatval($prices[0]),
                     'max' => floatval($prices[1]),
                 ];
             }
+            elseif (strpos($filter_key, $this->option_prefix) === 0) { // options section
+                $params['filter'][substr($filter_key, 2)] = explode(',', $filter_option);
+            }
             else { // brands and other sections
-                $params['filters'][$filter_key] = explode(',', $filter_option);
+                $params['filter'][$filter_key] = explode(',', $filter_option);
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php
index b09dd64..9c7de08 100755
--- a/common/modules/product/models/Category.php
+++ b/common/modules/product/models/Category.php
@@ -208,7 +208,6 @@ class Category extends \yii\db\ActiveRecord
             ->innerJoin('product_variant', 'product_variant.product_variant_id = product_variant_option.product_variant_id')
             ->innerJoin('product', 'product.product_id = product_variant.product_id')
             ->innerJoin('product_category', 'product_category.product_id = product.product_id')
-            ->innerJoin('tax_value_string', 'tax_value_string.tax_option_id = tax_option.tax_option_id')
             ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
             ->andWhere(['!=', 'product_variant.stock', 0]);
@@ -224,7 +223,6 @@ class Category extends \yii\db\ActiveRecord
             ->innerJoin('product', 'product.product_id = product_option.product_id')
             ->innerJoin('product_category', 'product_category.product_id = product.product_id')
             ->innerJoin('product_variant', 'product_variant.product_id = product.product_id')
-            ->innerJoin('tax_value_string', 'tax_value_string.tax_option_id = tax_option.tax_option_id')
             ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
             ->andWhere(['!=', 'product_variant.stock', 0]);
@@ -234,14 +232,13 @@ class Category extends \yii\db\ActiveRecord
                 'tax_group.*',
                 'tax_option.alias as option_alias',
                 'tax_group.alias as group_alias',
-                'tax_value_string.value as value',
+                'tax_option.name as value',
                 'tax_option.sort AS tax_option_sort',
                 'tax_group.sort AS tax_group_sort',
             ])
             ->from(['tax_option' ])
             ->where(['tax_option.tax_option_id'=>$query1->union($query2)])
             ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
-            ->innerJoin('tax_value_string', 'tax_value_string.tax_option_id = tax_option.tax_option_id')
             ->orderBy('tax_option.sort, tax_group.sort');
         return $query3;
     }
@@ -251,9 +248,8 @@ class Category extends \yii\db\ActiveRecord
 
         $connection = Yii::$app->getDb();
         $command = $connection->createCommand('
-                SELECT ton.alias as option_alias, *
+                SELECT ton.alias as option_alias,ton.name as value, *
                 FROM tax_option as ton
-                LEFT JOIN tax_value_string  as tvs ON  ton.tax_option_id = tvs.tax_option_id
                 RIGHT JOIN tax_group ON ton.tax_group_id = tax_group.tax_group_id
                 RIGHT JOIN tax_group_to_category ON tax_group.tax_group_id = tax_group_to_category.tax_group_id
                 WHERE  ton.tax_option_id IN (
@@ -276,7 +272,7 @@ class Category extends \yii\db\ActiveRecord
 
     public function setTaxGroup($value)
     {
-        return $this->tax_group = $value;
+        return $this->taxgroup = $value;
     }
 
     public function getTaxGroup()
diff --git a/frontend/controllers/OrderController.php b/frontend/controllers/OrderController.php
index 7d326aa..8f09577 100755
--- a/frontend/controllers/OrderController.php
+++ b/frontend/controllers/OrderController.php
@@ -118,11 +118,7 @@
                 'basket' => $basket,
             ]);
         }
-        
-        public function actionSuccess()
-        {
-            return $this->render('success');
-        }
+
         
         public function actionQuick()
         {
@@ -168,7 +164,14 @@
                 throw new InvalidConfigException('Товар не найден или не удалось загрузить данные о покупателе.');
             }
         }
-        
+
+
+        public function actionSuccess()
+        {
+            return $this->render('success');
+        }
+
+
         public function actionQuickBasket()
         {
             $response = \Yii::$app->response;
diff --git a/frontend/views/catalog/_product_item.php b/frontend/views/catalog/_product_item.php
index db2c240..47db205 100755
--- a/frontend/views/catalog/_product_item.php
+++ b/frontend/views/catalog/_product_item.php
@@ -51,8 +51,7 @@ use yii\helpers\Url;
               <?php if($model->variant->price_old){?>
                 <div class="dlexfduinxipi">
                     <span class="main">
-                        <s><?= $model->variant->price_old  ?>
-                        <span class="currency">грн</span><s>
+                        <s><?= $model->variant->price_old  ?><span class="currency">грн</span></s>
                     </span>
                 </div>
               <?php }?>
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index aca5c9a..867d8e3 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -137,15 +137,25 @@ FlipclockAsset::register($this);
             </div><!-- EOF Image part -->
             
             <!-- Info table -->
-            
+            <div class="event_info">
+                <div class="events">
+                    <?php foreach($product->events as $event):?>
+                        <?php if(!empty($event->banner) && $event->isActive()):?>
+                            <?=  Html::a(\common\components\artboximage\ArtboxImageHelper::getImage($event->getImageUrl('banner'), 'banner_list'),Url::to(['event/show','alias'=>$event->alias,'id'=>$event->primaryKey]))?>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </div>
+            </div>
             <div class="info" style="height: auto; opacity: 1;">
-                
+
+
                 <table class="info_table">
                     <colgroup>
                         <col style="width: 280px;">
                         <col style="width: 35px;">
                         <col>
                     </colgroup>
+
                     <tbody>
                     <tr>
                         <?php foreach($product->events as $event):?>
@@ -267,6 +277,7 @@ FlipclockAsset::register($this);
                     </tr>
                     <tr>
                         <td class="price_block">
+
                             <div class="price_block_container">
 
 
@@ -405,13 +416,7 @@ FlipclockAsset::register($this);
                 
                 
                 <div class="detail_tabs_content">
-                    <div class="events">
-                        <?php foreach($product->events as $event):?>
-                            <?php if(!empty($event->banner) && $event->isActive()):?>
-                                <?=  Html::a(\common\components\artboximage\ArtboxImageHelper::getImage($event->getImageUrl('banner'), 'event_in_product'),Url::to(['event/show','alias'=>$event->alias,'id'=>$event->primaryKey]))?>
-                            <?php endif; ?>
-                        <?php endforeach; ?>
-                    </div>
+
                     <div class="clear properties tab_div">
                         <h2 id="characteristics">
                             Характеристики <?= $product->name ?>
diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php
index 3693762..27a63fe 100755
--- a/frontend/views/catalog/products.php
+++ b/frontend/views/catalog/products.php
@@ -8,11 +8,16 @@ use frontend\widgets\Seo;
 use yii\helpers\Url;
     use yii\web\View;
     use yii\widgets\ListView;
+
+
     $this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : '';
 
     $this->params['seo']['fields']['meta-title'] = $category->meta_title;
     $this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
     $this->params['seo']['seo_text'] = $category->seo_text;
+
+
+
     $this->params['seo']['description'] = $category->meta_desc;
     $this->params['seo']['meta'] = $category->meta_robots;
     $this->params['seo']['category_name'] = $category->name;
diff --git a/frontend/views/event/show.php b/frontend/views/event/show.php
index 782cac8..b114172 100755
--- a/frontend/views/event/show.php
+++ b/frontend/views/event/show.php
@@ -58,10 +58,13 @@ $this->title = $model->name;
             ?>
         </div>
 
+        <div class="body_view">
             <?=$model->body?>
+        </div>
+
 
 
-        <div class="block-75" itemscope itemtype="http://schema.org/Product">
+        <div class="block-100" itemscope itemtype="http://schema.org/Product">
 
                 <div class="catalog_product_list view_table">
 
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 621a88e..4e2f521 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -63,7 +63,7 @@ use common\models\Event;
     </head>
 <?php $this->beginBody() ?>
     <body>
-    
+
     
     <div class="wraper">
         <div class="border">
@@ -422,8 +422,8 @@ use common\models\Event;
                 </div>
             </footer>
             
-            <div class="btn-fixeds fixed-events"><a href="#">акции</a></div>
-            <div class="btn-fixeds fixed-sale"><a href="#">Распродажа</a></div>
+            <div class="btn-fixeds fixed-events"><a href="/event">акции</a></div>
+<!--            <div class="btn-fixeds fixed-sale"><a href="/event">Распродажа</a></div>-->
 
             <table border="0" cellspacing="0" cellpadding="0" class="reqsBox">
             </table>
@@ -446,12 +446,7 @@ use common\models\Event;
     <div class="modal fade" id="price_drop" tabindex="-1" role="dialog" aria-labelledby="myModalLabel3">
         <div class="modal-dialog auth" role="document">
             <div class="modal-content">
-                
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="myModalLabel2">Узнать о снижении цены</h4>
-                </div>
+
                 
                 <div class="modal-body">
                     
@@ -492,7 +487,7 @@ use common\models\Event;
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="myModalLabel4">Где купить?</h4>
+                    <span class="modal-title" id="myModalLabel4">Где купить?</span>
                 </div>
                 
                 <div class="modal-body" style="text-transform:uppercase">
@@ -515,7 +510,7 @@ use common\models\Event;
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="myModalLabel4">Можно ли вернуть или обменять товар, если он мне не подошел?</h4>
+                    <span class="modal-title" id="myModalLabel4">Можно ли вернуть или обменять товар, если он мне не подошел?</span>
                 </div>
                 
                 <div class="modal-body">
@@ -542,7 +537,7 @@ use common\models\Event;
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="myModalLabel">Товар добавлен в закладки</h4>
+                    <span class="modal-title" id="myModalLabel">Товар добавлен в закладки</span>
                 </div>
                 
                 <div class="modal-body">
diff --git a/frontend/views/modal/forgot_password_form_model_window.php b/frontend/views/modal/forgot_password_form_model_window.php
index 6b5c79a..ddbd48b 100755
--- a/frontend/views/modal/forgot_password_form_model_window.php
+++ b/frontend/views/modal/forgot_password_form_model_window.php
@@ -4,7 +4,7 @@
 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel2">Напомнить пароль</h4>
+                <span class="modal-title" id="myModalLabel2">Напомнить пароль</span>
             </div>
 
             <div class="modal-body">
diff --git a/frontend/views/modal/login_window_model_window.php b/frontend/views/modal/login_window_model_window.php
index 496e6f7..53744b7 100755
--- a/frontend/views/modal/login_window_model_window.php
+++ b/frontend/views/modal/login_window_model_window.php
@@ -13,7 +13,7 @@ use yii\widgets\ActiveForm;
 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">Вход в личный кабинет</h4>
+                <span class="modal-title" id="myModalLabel">Вход в личный кабинет</span>
             </div>
 
             <div class="modal-body">
diff --git a/frontend/views/modal/my_callback_modal_window.php b/frontend/views/modal/my_callback_modal_window.php
index 79aa26b..0bcb26a 100755
--- a/frontend/views/modal/my_callback_modal_window.php
+++ b/frontend/views/modal/my_callback_modal_window.php
@@ -14,7 +14,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">Заказ обратного звонка</h4>
+                <span class="modal-title" id="myModalLabel">Заказ обратного звонка</span>
             </div>
             <div class="modal-body">
                 <?php
diff --git a/frontend/views/modal/registration_window_model_window.php b/frontend/views/modal/registration_window_model_window.php
index 4150c79..83fb462 100755
--- a/frontend/views/modal/registration_window_model_window.php
+++ b/frontend/views/modal/registration_window_model_window.php
@@ -13,7 +13,7 @@ use yii\widgets\ActiveForm;
 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel2">Создание профиля</h4>
+                <span class="modal-title" id="myModalLabel2">Создание профиля</span>
             </div>
 
             <div class="modal-body">
diff --git a/frontend/views/order/index.php b/frontend/views/order/index.php
index 83e367f..efe3bd5 100755
--- a/frontend/views/order/index.php
+++ b/frontend/views/order/index.php
@@ -38,106 +38,6 @@ use yii\web\View;
 
 
 
-                    <table border="0" cellspacing="0" cellpadding="0" class="boxGen articleBox">
-                        <tbody><tr class="bxhead">
-                            <th class="bxhl"></th>
-                            <th class="bxhc"><div class="h3">
-                                    <a href="view-articles/">Статьи</a>
-                                </div></th>
-
-                            <th class="bxhr"></th>
-                        </tr>
-
-                        <tr class="bxdelim">
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                        <tr class="bxmiddle">
-                            <td class="bxl"></td>
-                            <td class="bxc">                    <div width="100%" class="articlesBox"><!-- cats_table-->
-                                    <div width="100%">
-                                        <div class="articleItem">
-                            <span class="image">
-                                                            </span>
-                            <span align="left" class="title">
-                                <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm">
-                                    Линия света представила трендовые модели на Interior Mebel
-                                </a>
-                            </span>
-
-                                            <div align="left" class="desc">
-                                                <p>В Киеве прошла выставка Interior Mebel, которая уже традиционно собирает лучшие образцы дизайна интерьера. На...
-                                                    <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm">
-                                                        подробнее
-                                                    </a>
-                                                </p></div>
-
-                                        </div>
-
-
-                                        <div class="articleItem">
-                            <span class="image">
-                                                            </span>
-                            <span align="left" class="title">
-                                <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm">
-                                    Светодиодное освещение Light Topps | Светодиодные...
-                                </a>
-                            </span>
-
-                                            <div align="left" class="desc">
-                                                О светодиодных лампах и светильниках, в которых используются светодиодные модули, написано немало и наверняка уже...
-                                                <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm">
-                                                    подробнее
-                                                </a>
-                                            </div>
-
-                                        </div>
-
-
-                                        <div class="articleItem">
-                            <span class="image">
-                                                            </span>
-                            <span align="left" class="title">
-                                <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm">
-                                    Люстры потолочные. Новые возможности управления светом
-                                </a>
-                            </span>
-
-                                            <div align="left" class="desc">
-                                                Люстры потолочные оснащенные пультом дистанционного управления, позволяют включать/выключать, а также регулировать...
-                                                <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm">
-                                                    подробнее
-                                                </a>
-                                            </div>
-
-                                        </div>
-
-
-
-
-
-
-
-
-
-
-                                        <div style="clear: left;"></div>
-
-
-                                    </div>
-
-
-                                </div></td>
-                            <td class="bxr"></td>
-                        </tr>
-                        <tr class="bxbottom">
-                            <td class="bxbl"></td>
-                            <td class="bxbc"></td>
-                            <td class="bxbr"></td>
-                        </tr>
-                        </tbody></table>
-
                     <div class="clearfix"></div>
 
 
diff --git a/frontend/views/order/success.php b/frontend/views/order/success.php
index e75cfdf..806d55b 100755
--- a/frontend/views/order/success.php
+++ b/frontend/views/order/success.php
@@ -31,7 +31,7 @@
                                     <br><br>
                                     <div align="center">
                                         <font size="+1">Спасибо за заказ!!</font><br><br>
-                                        <a href="?p=start" style="display:inline">« На главную</a>
+                                        <a href="/" style="display:inline">« На главную</a>
                                     </div>
                                     <!-- Google ECommerce Code -->
                                     <script>
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index a72d224..c3ed1eb 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -3,6 +3,8 @@
 use yii\helpers\Html;
 use yii\web\View;
 
+
+
 ?>
 
 
diff --git a/frontend/web/css/css_header.css b/frontend/web/css/css_header.css
index 13131c6..f302ce3 100755
--- a/frontend/web/css/css_header.css
+++ b/frontend/web/css/css_header.css
@@ -14548,4 +14548,23 @@ ul.product-special li.promo div{
 
 .banner-in-list{
     margin: 0 !important;
-}
\ No newline at end of file
+}
+
+.event_info{
+    position: relative;
+    float: left;
+}
+.event_info .events a{
+    position: absolute;
+    left: -10px;
+    top: 80px;
+    display: inline;
+}
+.body_view{
+    max-width: 1140px;
+    overflow: hidden;
+}
+
+.block-100 .catalog_item{
+    width: 25% !important;
+}
diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php
index 688651e..4ea6b9f 100755
--- a/frontend/widgets/Seo.php
+++ b/frontend/widgets/Seo.php
@@ -148,51 +148,14 @@ class Seo extends Widget
                 $filter = \Yii::$app->request->get('filters', []);
 
 
-                $title = $this->selectSeoData(self::TITLE);
-
-
-                if(!empty($filter) && isset($this->fields['meta-title']) && $title == $this->fields['meta-title']) {
-
-                    $array = [
-                        'category' => $this->category_name
-                    ];
-
-
-                    if (isset($filter['brands']) && count($filter['brands']) == 1) {
-                        $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
-                        if(!$model instanceof Brand){
-
-                            \Yii::$app->response->redirect(['/site/error'],404);
-                        } else {
-                            $array['brand'] = $model->name;
-                        }
-
-                    }
-
-
-                    $optionsList = ArrayHelper::getColumn(TaxGroup::find()->where(['is_filter' => 'TRUE'])->all(),'alias');
-
-
-                    foreach($optionsList as $optionList){
-
-
-                        if (isset($filter[$optionList]) && count($filter[$optionList]) == 1) {
-
-                            $model = TaxOption::find()->where(['alias' =>$filter[$optionList]])->one();
-                            if(!$model instanceof TaxOption){
-
-                                \Yii::$app->response->redirect(['site/error'],404);
-                            } else {
-                                $array[$optionList] = $model->value->value;
-                            }
 
 
-
-                        }
-
+                $title = $this->selectSeoData(self::TITLE);
 
 
-                    }
+//                if(!empty($filter) && isset($this->fields['meta-title']) && $title == $this->fields['meta-title']) {
+                if(!empty($filter)) {
+                    $array = $this->arrayBuilder($filter);
 
                     $title_string = $this->getTitleString($array);
 
@@ -219,6 +182,14 @@ class Seo extends Widget
                         'content' => $description
                     ]);
 
+                } else {
+
+                    $filter = \Yii::$app->request->get('filters', []);
+                    if(!empty($filter)){
+                        $array = $this->arrayBuilder($filter);
+                        return $this->getDescriptionString($array);
+                    }
+
                 }
 
                 break;
@@ -265,7 +236,7 @@ class Seo extends Widget
                 ) {
                     $this->getView()->registerMetaTag([
                         'name' => 'robots',
-                        'content' => 'noindex,follow'
+                        'content' => 'noindex,nofollow'
                     ]);
                 } else {
 
@@ -366,17 +337,112 @@ class Seo extends Widget
     }
 
     public function getTitleString($array){
+        $row = "{Название раздела: Название блока фильтра: Фильтр 1 | Название блока фильтра: Фильтр 2 | Название блока фильтра: Фильтр 3} - купить в Киеве, Украине - интернет магазин Лінія Світла";
+        $row = '';
+        foreach($array as $name => $field){
+
+            if($name == 'category' ){
+                $row = $field.': '.$row;
+            } else {
+                $row .= $field['name'] .' '.$field['value'].' |'  ;
+            }
+
+
+
+        }
+        $row = substr($row, 0,-1 );
+        $row .= " - купить в Киеве, Украине - интернет магазин Лінія Світла";
+        return $row;
+//        $template = SeoDynamic::find()->select('title')->where(['param' =>'filters'])->one();
+//        if($template instanceof SeoDynamic){
+//            foreach ($array as $field_name => $field_value) {
+//                $template->title = str_replace('{' . $field_name . '}', mb_strtolower($field_value), $template->title);
+//            }
+//            $template =  preg_replace('/\{.[^\}]*\}\s/','',$template->title);
+//            return $template;
+//        }
+//
+//        return false;
+
+    }
+
+
+    public function getDescriptionString($array){
+        $row = "Лучшие цены на {Название раздела: Название блока фильтра: Фильтр 1 | Название блока фильтра: Фильтр 2 | Название блока фильтра: Фильтр 3}. Лінія Світла";
+        $row = 'Лучшие цены на ';
+        foreach($array as $name => $field){
 
-        $template = SeoDynamic::find()->select('title')->where(['param' =>'filters'])->one();
-        if($template instanceof SeoDynamic){
-            foreach ($array as $field_name => $field_value) {
-                $template->title = str_replace('{' . $field_name . '}', mb_strtolower($field_value), $template->title);
+            if($name == 'category' ){
+                $row = $field.': '.$row;
+            } else {
+                $row .= $field['name'] .' '.$field['value'].' |'  ;
             }
-            $template =  preg_replace('/\{.[^\}]*\}\s/','',$template->title);
-            return $template;
+
+
+
         }
+        $row = substr($row, 0,-1 );
+        $row .= ". Лінія Світла";
+        return $row;
+//        $template = SeoDynamic::find()->select('title')->where(['param' =>'filters'])->one();
+//        if($template instanceof SeoDynamic){
+//            foreach ($array as $field_name => $field_value) {
+//                $template->title = str_replace('{' . $field_name . '}', mb_strtolower($field_value), $template->title);
+//            }
+//            $template =  preg_replace('/\{.[^\}]*\}\s/','',$template->title);
+//            return $template;
+//        }
+//
+//        return false;
+
+    }
+
+
+    public function arrayBuilder($filter)
+    {
+
+            $array = [
+                'category' => $this->category_name
+            ];
+
+
+            if (isset($filter['brands']) && count($filter['brands']) == 1) {
+                $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
+                if (!$model instanceof Brand) {
+
+                    \Yii::$app->response->redirect(['/site/error'], 404);
+                } else {
+                    $array['brand']['name'] = 'Бренд';
+                    $array['brand']['value'] = $model->name;
+                }
+
+            }
+
+
+            $optionsList = ArrayHelper::map(TaxGroup::find()->where(['is_filter' => 'TRUE'])->all(), 'alias', 'name');
+
+
+            foreach ($optionsList as $optionList => $name) {
+
+
+                if (isset($filter[$optionList]) && count($filter[$optionList]) == 1) {
+
+                    $model = TaxOption::find()->where(['alias' => $filter[$optionList]])->one();
+                    if (!$model instanceof TaxOption) {
+
+                        \Yii::$app->response->redirect(['site/error'], 404);
+                    } else {
+                        $array[$optionList]['value'] = $model->value;
+                        $array[$optionList]['name'] = $name;
+                    }
+
+
+                }
+
+
+            }
 
-        return false;
+        return $array;
 
     }
 
--
libgit2 0.21.4