spree_core 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3057b4eecebae24385eed939c3236d14177222693d927f85e7fac5ac775cbdec
-  data.tar.gz: 8f5f40c80e021a02bb985b119f9c6f5e90d268392b81984df85d0f738208866e
+  metadata.gz: f0c46fae6279b3cdf251b8a40b119657c8caadaa17303780cb8d156294dd8ae7
+  data.tar.gz: ffb59060c4a5bc4519ccf32d9c36304daf793bdfced97c29904bcf468603c20f
 SHA512:
-  metadata.gz: a495af06eebc663bb6c69ccf12b411989f8283ac36edd633b21421bf0b152dbc91315515ea1c5189a1c4b43f45d397fd1d076ad9e35c08e35bdf8f6df573d50e
-  data.tar.gz: e559d035f7ef2359141281dbc4d42dd2f0791ac0c42f7ecc47a638ba0f1dd1bffab385e35389b70409ce1bf856c609a4dabf7edbbb428778f05545e12269b726
+  metadata.gz: 6dd61df3b304c7a44120c0390e815cea1188660753af20dd98792e0322288fc3a54d20a31879ced1e8ac06fe95639822a9ed9262066b13f42c1d05139f99bc9a
+  data.tar.gz: 52599c5170cbc0d2bfae5e6de7d5731b0be566b78d287f47d692a6dc7176ae2898da9bf0a6b9b98a312170733d0d53543a92c3834a3e6f4ffd63f771d9244f48

data/app/helpers/spree/base_helper.rb

@@ -95,6 +95,8 @@ module Spree
     end
 
     def pretty_time(time)
+      return '' if time.blank?
+
       [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
     end
 

data/app/helpers/spree/products_helper.rb

@@ -58,9 +58,13 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      count = products.count
+      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/all-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{count}-#{@taxon&.id}"
+      products_cache_keys = "spree/products/#{ids}-#{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.0'
+    '4.1.1'
   end
 end

metadata

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