solidus_core 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd2f50ef956981c4eea96a103f8b55dacbd4346154398d182b666fa8d9bc481
-  data.tar.gz: 68e8a3ae5c6ae357056baa0b77c50d7908ee797e4d3f85536bcae32caf5b10d7
+  metadata.gz: b3b81a2fffd48fc3f7d19f9d2a1a97508fb87670806a32b846286ad9c776bb3d
+  data.tar.gz: 110be3514bd3790c56161fd483fcab60ec9775d47713e775e69e3b771e828f6e
 SHA512:
-  metadata.gz: 538ddcf9279c83fd9048f7a773a64b24229beff0e40dd37d247e80b7299cbee41c45a9ce94bf106cfa3230af729f597a1d31272fd4f06b2376ec121b64253885
-  data.tar.gz: c1acc659d80a20a6caa9e8eb4b32b5dc16be15c7c8cc76a3d216efc06440dd3e06cac13a3cce888836bb5481a5f84a1d449f8f3a3d425b9d92a335ef2ef5bfbd
+  metadata.gz: a240cdb0e5706a7185c2c5892d1ce46b7be0731e01069af22377763a980c97926cd162b1ed7b0e28a930673fcca48029c3f43135ddc168f9ca9ac0a31c370798
+  data.tar.gz: d5ff58c166cd979378712de1b6b0152889a232cef0b4af0aee111cc0681cc1ad23040b81e5180bf0b3abcbe6e20a029df4b390a0710aefa6a513231621a2b8ea

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.6.3"
+    "2.6.4"
   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.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer