Filter fixing

Yarik
1 parent aa5c63f4
Showing 6 changed files with 49 additions and 30 deletions Show diff stats
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/Product.php
common/modules/rubrication/models/TaxGroup.php
frontend/controllers/CatalogController.php
frontend/views/catalog/product.php
frontend/views/search/index.php
@@ -292,4 +292,12 @@
  
             return $query;
         }
+        
+        public static function addLastCategory($category_id) {
+            \Yii::$app->session->set('last_category_id', $category_id);
+        }
+        
+        public static function getLastCategory() {
+            return \Yii::$app->session->get('last_category_id');
+        }
     }
 \ No newline at end of file
@@ -11,6 +11,7 @@ use common\modules\rubrication\models\TaxGroup;
 use common\modules\rubrication\models\TaxOption;
 use Yii;
 use common\modules\relation\relationBehavior;
+use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
 use yii\helpers\ArrayHelper;
  
@@ -240,7 +241,10 @@ class Product extends \yii\db\ActiveRecord
     public function getVariantsWithFilters(){
         return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->with('filters');
     }
-
+    
+    /**
+     * @return ActiveQuery
+     */
     public function getCategory() {
         return $this->hasOne(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id']);
     }
@@ -263,12 +267,12 @@ class Product extends \yii\db\ActiveRecord
         return $groups;
     }
  
-    public function getActiveProperties() {
+    public function getActiveProperties($category_id) {
         $groups = $options = [];
         foreach ($this->options as $option) {
             $options[$option->tax_group_id][] = $option;
         }
-        foreach (TaxGroup::find()->where(['tax_group_id' => array_keys($options), 'display' => TRUE])->all() as $group) {
+        foreach (TaxGroup::find()->joinWith('categories')->where(['tax_group.tax_group_id' => array_keys($options), 'tax_group.display' => TRUE, 'category.category_id' => $category_id])->all() as $group) {
             if (!empty($options[$group->tax_group_id])) {
                 $group->_options = $options[$group->tax_group_id];
                 $groups[] = $group;
@@ -432,6 +436,6 @@ class Product extends \yii\db\ActiveRecord
     public function getTaxGroupsByLevel($level)
     {
         $categories = ArrayHelper::getColumn($this->categories, 'category_id');
-        return TaxGroup::find()->distinct()->innerJoin('relation', 'entity1_id = tax_group_id')->where(['relation.entity2_id' => $categories])->where(['level' => $level]);
+        return TaxGroup::find()->distinct()->innerJoin('relation', 'entity1_id = tax_group_id')->andWhere(['relation.entity2_id' => $categories])->andWhere(['level' => $level]);
     }
 }
@@ -2,6 +2,7 @@
  
 namespace common\modules\rubrication\models;
  
+use common\modules\product\models\Category;
 use common\modules\relation\relationBehavior;
 use Yii;
  
@@ -99,6 +100,12 @@ class TaxGroup extends \yii\db\ActiveRecord
         return $this->hasMany(TaxGroupToGroup::className(), ['tax_group1_id' => 'tax_group_id'])->inverseOf('taxGroup1');
     }
  
+    public function getCategories()
+    {
+        return $this->hasMany(Category::className(), ['category_id' => 'entity2_id'])
+                    ->viaTable('relation', ['entity1_id' => 'tax_group_id']);
+    }
+    
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -45,6 +45,8 @@
                 return $this->render('catalog');
             }
  
+            ProductHelper::addLastCategory($category->category_id);
+            
             $params = [ ];
  
             $optionsList = ArrayHelper::getColumn(TaxGroup::find()
@@ -172,9 +174,18 @@
  
             ProductHelper::addLastProsucts($product->product_id);
  
+            $category = null;
+            $last_category_id = ProductHelper::getLastCategory();
+            if(!empty($last_category_id)) {
+                $category = $product->getCategory()->andWhere(['category_id' => $last_category_id])->one();
+            }
+            if(empty($category)) {
+                $category = $product->category;
+            }
+            
             return $this->render('product', [
                 'product'  => $product,
-                'category' => $product->category,
+                'category' => $category,
             ]);
         }
  
 <?php
+    /**
+     * @var Category $category
+     */
     //    use common\modules\comment\models\Comment;
     //    use common\modules\comment\models\Rating;
     //    use common\modules\comment\widgets\CommentWidget;
     use common\modules\comment\widgets\CommentWidget;
-    use kartik\rating\StarRating;
-    use yii\helpers\Html;
-    use yii\widgets\ActiveForm;
-    use yii\widgets\Breadcrumbs;
+    use common\modules\product\models\Category;
     use yii\web\View;
     use yii\helpers\Url;
     use frontend\widgets\Seo;
  
-    $this->params[ 'seo' ][ 'key' ] = $product->category->categoryName->value;
+    $this->params[ 'seo' ][ 'key' ] = $category->categoryName->value;
     $this->params[ 'seo' ][ 'fields' ][ 'name' ] = $product->fullname;
     $this->params[ 'seo' ][ 'h1' ] = !empty( Seo::widget([ 'row' => 'h1' ]) ) ? Seo::widget([ 'row' => 'h1' ]) : $product->fullname;
  
@@ -30,10 +30,10 @@
         'url'   => [ 'catalog/category' ],
     ];
     $this->params[ 'breadcrumbs' ][] = [
-        'label' => $product->category->categoryName->value,
+        'label' => $category->categoryName->value,
         'url'   => [
             'catalog/category',
-            'category' => $product->category,
+            'category' => $category,
         ],
     ];
     $this->params[ 'breadcrumbs' ][] = $product->fullname . ' #' . $product->enabledVariants[ 0 ]->sku;
@@ -126,8 +126,8 @@
                                     data-imageoriginal="<?= $variant->imageUrl ?>"
                                     title="<?= $product->fullname ?>">
                                     <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant', [
-                                        'alt'   => $product->category->categoryName->value . ' ' . $product->fullname,
-                                        'title' => $product->category->categoryName->value . ' ' . $product->fullname,
+                                        'alt'   => $category->categoryName->value . ' ' . $product->fullname,
+                                        'title' => $category->categoryName->value . ' ' . $product->fullname,
                                     ]) ?>
                                 </a>
                             </li>
@@ -228,7 +228,7 @@
                     <li><a href="#">Характеристики</a>
                         <div class="info">
                             <p>Бренд: <?= $product->brand->name ?></p>
-                            <?php foreach($product->activeProperties as $group): ?>
+                            <?php foreach($product->getActiveProperties($category->category_id) as $group): ?>
                                 <p><?= $group->name ?> <?php foreach($group->_options as $option) : ?>&nbsp;<?= $option->ValueRenderHTML ?><?php endforeach ?></p>
                             <?php endforeach; ?>
                         </div>
@@ -262,8 +262,8 @@
                 <center>
                     <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[ 0 ]->imageUrl, 'product_view', [
                             'id'    => 'pic',
-                            'alt'   => $product->category->categoryName->value . ' ' . $product->fullname,
-                            'title' => $product->category->categoryName->value . ' ' . $product->fullname,
+                            'alt'   => $category->categoryName->value . ' ' . $product->fullname,
+                            'title' => $category->categoryName->value . ' ' . $product->fullname,
                         ]) ?></a>
                 </center>
             </div>
@@ -271,8 +271,8 @@
                 <?php foreach($product->images as $image): ?>
                     <li><a href="<?= $image->imageUrl ?>" rel="shadowbox[gal]">
                             <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2', [
-                                'alt'   => $product->category->categoryName->value . ' ' . $product->fullname,
-                                'title' => $product->category->categoryName->value . ' ' . $product->fullname,
+                                'alt'   => $category->categoryName->value . ' ' . $product->fullname,
+                                'title' => $category->categoryName->value . ' ' . $product->fullname,
                             ]) ?>
                         </a></li>
                 <?php endforeach; ?>
@@ -21,17 +21,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = [&#39;label&#39; =&gt; &#39;Поиск&#39;, &#39;url&#39; =&gt; [&#39;catalog/ca
 $this->params['seo']['meta']= 'noindex,follow';
 ?>
  
-
-<nav class="bread-crumbs">
-    <?= \yii\widgets\Breadcrumbs::widget ([
-        'links' => $this->params['breadcrumbs'],
-    ])
-    ?>
-
-
-    <div class="both"></div>
-</nav>
-
 <div class="loyout">
     <?php if(!empty($categories)) :?>
     <div class="leftbar">