From 6fa4aa31c8ac38e0581ad47ba8ba7e4d4c6089fd Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 23 Jan 2017 16:47:57 +0200 Subject: [PATCH] -Sort ready --- common/models/FilterCache.php | 0 console/controllers/FeedController.php | 0 console/controllers/FilterController.php | 0 console/migrations/m161104_094427_filter_cache.php | 0 frontend/models/ProductFrontendSearch.php | 4 ++-- frontend/web/css/ion.rangeSlider.css | 0 frontend/web/css/ion.rangeSlider.skinHTML5.css | 0 frontend/web/feed.csv | 0 frontend/web/js/filter.js | 0 frontend/web/js/ion.rangeSlider.js | 0 frontend/web/sitemap.xml | 0 frontend/widgets/FilterList.php | 0 12 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 common/models/FilterCache.php mode change 100644 => 100755 console/controllers/FeedController.php mode change 100644 => 100755 console/controllers/FilterController.php mode change 100644 => 100755 console/migrations/m161104_094427_filter_cache.php mode change 100644 => 100755 frontend/web/css/ion.rangeSlider.css mode change 100644 => 100755 frontend/web/css/ion.rangeSlider.skinHTML5.css mode change 100644 => 100755 frontend/web/feed.csv mode change 100644 => 100755 frontend/web/js/filter.js mode change 100644 => 100755 frontend/web/js/ion.rangeSlider.js mode change 100644 => 100755 frontend/web/sitemap.xml mode change 100644 => 100755 frontend/widgets/FilterList.php diff --git a/common/models/FilterCache.php b/common/models/FilterCache.php old mode 100644 new mode 100755 index 81ee210..81ee210 --- a/common/models/FilterCache.php +++ b/common/models/FilterCache.php diff --git a/console/controllers/FeedController.php b/console/controllers/FeedController.php old mode 100644 new mode 100755 index 661f6f0..661f6f0 --- a/console/controllers/FeedController.php +++ b/console/controllers/FeedController.php diff --git a/console/controllers/FilterController.php b/console/controllers/FilterController.php old mode 100644 new mode 100755 index b4998c6..b4998c6 --- a/console/controllers/FilterController.php +++ b/console/controllers/FilterController.php diff --git a/console/migrations/m161104_094427_filter_cache.php b/console/migrations/m161104_094427_filter_cache.php old mode 100644 new mode 100755 index 62a6056..62a6056 --- a/console/migrations/m161104_094427_filter_cache.php +++ b/console/migrations/m161104_094427_filter_cache.php diff --git a/frontend/models/ProductFrontendSearch.php b/frontend/models/ProductFrontendSearch.php index b67c943..46a5f6f 100755 --- a/frontend/models/ProductFrontendSearch.php +++ b/frontend/models/ProductFrontendSearch.php @@ -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]); diff --git a/frontend/web/css/ion.rangeSlider.css b/frontend/web/css/ion.rangeSlider.css old mode 100644 new mode 100755 index 68fd119..68fd119 --- a/frontend/web/css/ion.rangeSlider.css +++ b/frontend/web/css/ion.rangeSlider.css diff --git a/frontend/web/css/ion.rangeSlider.skinHTML5.css b/frontend/web/css/ion.rangeSlider.skinHTML5.css old mode 100644 new mode 100755 index 1fd2d73..1fd2d73 --- a/frontend/web/css/ion.rangeSlider.skinHTML5.css +++ b/frontend/web/css/ion.rangeSlider.skinHTML5.css diff --git a/frontend/web/feed.csv b/frontend/web/feed.csv old mode 100644 new mode 100755 index b162b4d..b162b4d --- a/frontend/web/feed.csv +++ b/frontend/web/feed.csv diff --git a/frontend/web/js/filter.js b/frontend/web/js/filter.js old mode 100644 new mode 100755 index f91c837..f91c837 --- a/frontend/web/js/filter.js +++ b/frontend/web/js/filter.js diff --git a/frontend/web/js/ion.rangeSlider.js b/frontend/web/js/ion.rangeSlider.js old mode 100644 new mode 100755 index ea0b5ea..ea0b5ea --- a/frontend/web/js/ion.rangeSlider.js +++ b/frontend/web/js/ion.rangeSlider.js diff --git a/frontend/web/sitemap.xml b/frontend/web/sitemap.xml old mode 100644 new mode 100755 index c7028e5..c7028e5 --- a/frontend/web/sitemap.xml +++ b/frontend/web/sitemap.xml diff --git a/frontend/widgets/FilterList.php b/frontend/widgets/FilterList.php old mode 100644 new mode 100755 index 117dae4..117dae4 --- a/frontend/widgets/FilterList.php +++ b/frontend/widgets/FilterList.php -- libgit2 0.21.4