From 2c4d173e4cb48a56c2952a8e0c8caf77a515a256 Mon Sep 17 00:00:00 2001
From: Karnovsky A <Karnovsky.a@gmail.com>
Date: Fri, 25 Mar 2016 10:52:39 +0200
Subject: [PATCH] Base-product#6 functional

---
 frontend/controllers/CatalogController.php | 14 ++++++++++----
 frontend/views/catalog/products.php        |  6 ++++++
 frontend/web/css/concat_all.css            |  6 ++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php
index 5da6511..3ea70ef 100644
--- a/frontend/controllers/CatalogController.php
+++ b/frontend/controllers/CatalogController.php
@@ -120,14 +120,20 @@ class CatalogController extends \yii\web\Controller
 
             // Options
             if (($options = \Yii::$app->request->get('option')) != false) {
-                $query->innerJoin(ProductOption::tableName(), ProductOption::tableName() .'.product_id='. Product::tableName() .'.product_id');
-                $query->innerJoin(TaxOption::tableName(), TaxOption::tableName() .'.tax_option_id='. ProductOption::tableName() .'.option_id');
-                foreach($options as $group_alias => $option_alias) {
+//                $query->innerJoin(ProductOption::tableName(), ProductOption::tableName() .'.product_id='. Product::tableName() .'.product_id');
+//                $query->innerJoin(TaxOption::tableName(), TaxOption::tableName() .'.tax_option_id='. ProductOption::tableName() .'.option_id');
+                foreach($options as $group_alias => $options_alias) {
+                    if (!is_array($options_alias)) {
+                        $options_alias = [$options_alias];
+                    }
+                    foreach($options_alias as &$option_alias) {
+                        $option_alias = "'". $option_alias ."'";
+                    }
                     $group = TaxGroup::find()->where(['like', 'alias', $group_alias])->one();
                     if (!$group) {
                         continue;
                     }
-                    $query->andWhere([TaxOption::tableName() .'.tax_group_id' => $group->tax_group_id, TaxOption::tableName() .'.alias' => $option_alias]);
+                    $query->andWhere(Product::tableName() .'.product_id IN (SELECT product_id FROM product_option INNER JOIN tax_option ON tax_option.tax_option_id = product_option.option_id WHERE tax_option.alias IN ('. implode(',', $options_alias) .'))');
                 }
             }
 
diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php
index ff2e430..67bf373 100644
--- a/frontend/views/catalog/products.php
+++ b/frontend/views/catalog/products.php
@@ -186,6 +186,10 @@ $this->params['breadcrumbs'][] = $category->name;
     <div class="cat_p_catalog_list">
         <div class="title"><?= $category->name?> <span>(<?= $all_count?>)</span></div>
 
+        <?php if (empty($products)) :?>
+            <h2>По данному запросу товары не найдены.</h2><br>
+            <p>Показать <a href="<?= \yii\helpers\Url::to(['catalog/category', 'alias' => $category->alias])?>">все товары из категории "<?= $category->name?>"</a></p>
+        <?php else :?>
         <!-- sort menu -->
         <div class="sort_menu">
 
@@ -267,6 +271,8 @@ $this->params['breadcrumbs'][] = $category->name;
                 </div>
             </div>
         </div>
+
+        <?php endif?>
     </div>
 </div>
 
diff --git a/frontend/web/css/concat_all.css b/frontend/web/css/concat_all.css
index 291bb33..7e40883 100644
--- a/frontend/web/css/concat_all.css
+++ b/frontend/web/css/concat_all.css
@@ -43,6 +43,11 @@
   display: inline-block;
   float: left;
 }
+.cat_p_filter_bar:before {
+  display: block;
+  content: '';
+  clear: both;
+}
 
 .cat_p_filter_bar .filter_list ul {
   list-style: none;
@@ -190,6 +195,7 @@
   width: 700px;
   padding-right: 10px;
   display: inline-block;
+  min-height: 20em;
 }
 
 .cat_p_catalog_list ul {
--
libgit2 0.21.4