Commit 2dea03a814b21a029249a07c891064731accd089
Merge branch 'master' of gitlab.artweb.com.ua:Alex/linija-svitla
Showing
11 changed files
with
4 additions
and
2 deletions
Show diff stats
.gitignore
console/migrations/m161104_094427_filter_cache.php
100644 → 100755
frontend/models/ProductFrontendSearch.php
| @@ -102,8 +102,8 @@ class ProductFrontendSearch extends Product { | @@ -102,8 +102,8 @@ class ProductFrontendSearch extends Product { | ||
| 102 | $query->select(['product.*']); | 102 | $query->select(['product.*']); |
| 103 | $query->joinWith(['enabledVariants','brand','options', 'category']); | 103 | $query->joinWith(['enabledVariants','brand','options', 'category']); |
| 104 | 104 | ||
| 105 | - $query->groupBy(['product.product_id', 'product_variant.price']); | ||
| 106 | - | 105 | + $query->groupBy(['product.product_id', 'product_variant.price', 'product_variant.stock']); |
| 106 | + $query->orderBy(['product_variant.stock' => SORT_DESC]); | ||
| 107 | ProductHelper::_setQueryParams($query, $params); | 107 | ProductHelper::_setQueryParams($query, $params); |
| 108 | if($in_stock){ | 108 | if($in_stock){ |
| 109 | $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]); | 109 | $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]); |
frontend/web/css/ion.rangeSlider.skinHTML5.css
100644 → 100755