Merge branch 'master' of gitlab.artweb.com.ua:Alex/linija-svitla

Alex Savenko
2 parents 2871cf43 2a0cc102
Showing 11 changed files with 4 additions and 2 deletions Show diff stats
.gitignore
common/models/FilterCache.php
console/controllers/FeedController.php
console/controllers/FilterController.php
console/migrations/m161104_094427_filter_cache.php
frontend/models/ProductFrontendSearch.php
frontend/web/css/ion.rangeSlider.css
frontend/web/css/ion.rangeSlider.skinHTML5.css
frontend/web/js/filter.js
frontend/web/js/ion.rangeSlider.js
frontend/widgets/FilterList.php
@@ -50,3 +50,5 @@ composer.lock
 tests/_output/*
 /common/modules/_comment/
 Будет удалено common/modules/comment/
+/frontend/web/sitemap.xml
+/frontend/web/feed.csv
@@ -102,8 +102,8 @@ class ProductFrontendSearch extends Product {
         $query->select(['product.*']);
         $query->joinWith(['enabledVariants','brand','options', 'category']);
  
-        $query->groupBy(['product.product_id', 'product_variant.price']);
-
+        $query->groupBy(['product.product_id', 'product_variant.price', 'product_variant.stock']);
+        $query->orderBy(['product_variant.stock' => SORT_DESC]);
         ProductHelper::_setQueryParams($query, $params);
         if($in_stock){
             $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);