Merge remote-tracking branch 'origin/master'

Yarik
2 parents 096128d9 ff1da5e9
Showing 2 changed files with 10 additions and 7 deletions Show diff stats
common/modules/product/helpers/ProductHelper.php
frontend/web/js/filter.js
@@ -132,7 +132,10 @@
             if(!is_object($product)) {
                 $product = Product::find()
                                   ->where([ 'product_id' => $product ])
-                                  ->with('enabledVariants')
+                                  ->with([
+                                      'enabledVariants',
+                                      'variant',
+                                         ])
                                   ->one();
             }
@@ -153,8 +156,8 @@
                                 1,
                             ])
                             ->andWhere([ 'product_category.category_id' => $product_categories ]);
-                    $query->andWhere(['>=', 'product_variant.price', $product->enabledVariant->price * 0.7]);
-                    $query->andWhere(['<=', 'product_variant.price', $product->enabledVariant->price * 1.3]);
+                    $query->andWhere(['>=', 'product_variant.price', $product->variant->price * 0.7]);
+                    $query->andWhere(['<=', 'product_variant.price', $product->variant->price * 1.3]);
             $query->innerJoin('product_option', 'product_option.product_id = product.product_id');
             $where = [ ];
@@ -192,7 +195,6 @@
         /**
          * @param ActiveQuery $query
          * @param             $params
-         * @param bool        $setPriceLimits
          */
         public static function _setQueryParams(&$query, $params)
         {
@@ -72,9 +72,10 @@ function priceRequest(link){
         data: {info:filter,category:id},
         success: function(result){
             if(result=='0'){
-                $(link).addClass('disabled-link');
-                tag.find('input').prop( "disabled", true );
-                $(link).find("span").html('('+result+')');
+                $(link).parent().parent().parent().remove();
+//                $(link).addClass('disabled-link');
+//                tag.find('input').prop( "disabled", true );
+//                $(link).find("span").html('('+result+')');
             } else {
                 $(link).removeClass('disabled-link');
                 tag.find('input').prop( "disabled", false );