solidus_core 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b353f76018590b3096aec9635da22d277a64c23a01e231fe0aa3960dace50c2
-  data.tar.gz: e19bfadcb93dac8ab98f673a410e83181c6ef96e4df54a84a2aaea6c1fee977f
+  metadata.gz: 58fc9826b5f9c9a2fd48509544a0a15b7ee6aac8b914c704f2906851fcbe658f
+  data.tar.gz: 50437dd8a03e88e07d2f83041179076e7294bacb98fab11c178085a002ec3a90
 SHA512:
-  metadata.gz: ba3e6b540d932e49d9fb43fadfe73c070593d9894e355ddfa494534820ae5e39a24d97e049d180cdcc70cf524235c3fa482a486effeb013eb9ff9c24b13886ac
-  data.tar.gz: 0f1b179013b7252310ac174d88ab6a5f723e3c2dcbb2e59f13de4ba2b1f184058c00ce7dc61132930608ad8b619bfc936b5c5756a66ff18f2d6ab8f3e180dbbe
+  metadata.gz: 4cd8daac9a994195acf74958dbadbe74ab0c515a5bb712eca2e97ead8b02690ab1218522696a628f13814ab825cb97a3dfe99404e0d07812a235e5b5987b76d8
+  data.tar.gz: 3700a96155cf19803eb8200762358a22c1d15b106a643ceda69d4031d461895bd1caffc2309731d2348c7051262430c706e85f196fc910887e1040f92f2fca32

data/app/helpers/spree/taxons_helper.rb

@@ -7,12 +7,12 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
       price_scope = Spree::Price.where(current_pricing_options.search_arguments)
-      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
+      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").limit(max)
       if products.size < max
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |descendent_taxon|
           to_get = max - products.length
-          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/models/spree/product/scopes.rb

@@ -63,9 +63,10 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      includes(:classifications).
-      where("spree_products_taxons.taxon_id" => taxon.self_and_descendants.pluck(:id)).
-      order(Spree::Classification.arel_table[:position].asc)
+      includes(:classifications)
+        .where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id))
+        .select(Spree::Classification.arel_table[:position])
+        .order(Spree::Classification.arel_table[:position].asc)
     end
 
     # This scope selects products in all taxons AND all its descendants

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.7.1"
+    "2.7.2"
   end
 
   def self.solidus_gem_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer