spree_core 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b705f768f8ff59c9810f09dd3a99a68c2dc13811769a180069b9261009d9cdff
-  data.tar.gz: a64dba1a7bf10999d6e588a9411e39172f25c93f9a26876719b1d6da5940bb0a
+  metadata.gz: cba2996dac2e758ba562efcfc4e1bf1f99c873bcb0af1e878ce372339c86263e
+  data.tar.gz: 1404bec2819dc8872517d3d19a5f5faa2683e5b7c3265e4afeeaad6ff7f8476c
 SHA512:
-  metadata.gz: 0d49c78014b9a7899e754dbe299bb00b293939d7e25e5091cf3124a0951da7076303ce358da23e790f7efe626bce656b09d9cdf3a5a512cdefbff5cee739faa2
-  data.tar.gz: 6dbe8cdd4dd58cb1f8a8c5e9bd6b1d34344e119f8df0839a4824d9f3fc809f1215def97bec41b47732d2530c48e63a0c5e5f808c027353b551eb169b004ba013
+  metadata.gz: 628cdea24cd029809e4e1d1861ffa5ac90e2de240f5b779d1cfa02e9d9c3728a8f251092ae345e741bd56d060aeecc71d9a8716e0c276a488065dc7169cb04af
+  data.tar.gz: 38ff19725ca382a75cc8735285be96d7f786832c86f36db0f8b1164b3914a280c57502df22db8c8e82f1fb84039b5f574454934a1596182a4a312f7355877118

data/app/finders/spree/products/find.rb

@@ -29,7 +29,7 @@ module Spree
         products = include_discontinued(products)
         products = ordered(products)
 
-        products
+        products.distinct
       end
 
       private
@@ -81,14 +81,13 @@ module Spree
       def by_skus(products)
         return products unless skus?
 
-        products.joins(:variants_including_master).distinct.where(spree_variants: { sku: skus })
+        products.joins(:variants_including_master).where(spree_variants: { sku: skus })
       end
 
       def by_price(products)
         return products unless price?
 
         products.joins(master: :default_price).
-          distinct.
           where(
             spree_prices: {
               amount: price.min..price.max,
@@ -100,7 +99,7 @@ module Spree
       def by_taxons(products)
         return products unless taxons?
 
-        products.joins(:taxons).distinct.where(spree_taxons: { id: taxons })
+        products.joins(:taxons).where(spree_taxons: { id: taxons })
       end
 
       def by_name(products)

data/app/helpers/spree/products_helper.rb

@@ -58,13 +58,8 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      ids = if products.is_a?(Array)
-              products.map(&:id)
-            else
-              products.ids
-            end.join('-')
       max_updated_at = (products.maximum(:updated_at) || Date.today).to_s(:number)
-      products_cache_keys = "spree/products/#{ids}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
+      products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.2'
+    '4.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant