spree_core 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1643c4f1dedde056b96b0c1e6c312c452084a0d34bc2d5ed2abc648d2185f43a
-  data.tar.gz: cbc7c195925ef217208fa373120ebbd8cef241815dadedd24972bcd9cf904eb4
+  metadata.gz: 96827f4cde98df9373667a89b28276d3ffc954bf7e2c25fb33d1675012c518ef
+  data.tar.gz: c84bd003851d88dae731ac73e31041a9fd0a523357c3b48476686935cdf7b070
 SHA512:
-  metadata.gz: 337338d05ac9009476f2e66e099abc21f13461b1db2e02e85a571d722de625f6bcc38fd1009ae8a78bef10ff19aee2e687438da5415a5888125e930ee6865c21
-  data.tar.gz: 92275d9db7cecb217bc2922898e9e1ce0359eac14606e11686ed339b5173826a2cd85329adc9c3a4bd713740e9f419f9e2909bef4024280c947bf301ce3d8a35
+  metadata.gz: d8aba081fef39e67d547ca039dcf20477d10388a9c382e8f368b4be2ed0e86496f96b86b557f400bdcece01a86f29c09868f7176442875bd6fc79ea2843c729d
+  data.tar.gz: 565ba5fe5695eada6e6b0e530ae318be22b1105200d8138595a17b39eef1ed4e0d4e1a8ccdd65e7b4b6ac349394bad2a78e18eee932ed5bbc19284e49b562f48

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

@@ -99,7 +99,7 @@ module Spree
       def by_taxons(products)
         return products unless taxons?
 
-        products.joins(:taxons).where(spree_taxons: { id: taxons })
+        products.joins(:classifications).where(Classification.table_name => { taxon_id: taxons })
       end
 
       def by_name(products)
@@ -142,13 +142,25 @@ module Spree
 
         case sort_by
         when 'default'
-          products
+          if taxons?
+            products.
+              select("#{Product.table_name}.*, #{Classification.table_name}.position").
+              order("#{Classification.table_name}.position" => :asc)
+          else
+            products
+          end
         when 'newest-first'
           products.order(available_on: :desc)
         when 'price-high-to-low'
-          products.select('spree_products.*, spree_prices.amount').reorder('').send(:descend_by_master_price)
+          products.
+            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+            reorder('').
+            send(:descend_by_master_price)
         when 'price-low-to-high'
-          products.select('spree_products.*, spree_prices.amount').reorder('').send(:ascend_by_master_price)
+          products.
+            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+            reorder('').
+            send(:ascend_by_master_price)
         end
       end
 
@@ -160,10 +172,11 @@ module Spree
         discontinued ? products : products.available
       end
 
-      def taxon_ids(taxon_id)
-        return unless (taxon = Spree::Taxon.find_by(id: taxon_id))
+      def taxon_ids(taxons_ids)
+        return if taxons_ids.nil? || taxons_ids.to_s.blank?
 
-        taxon.self_and_descendants.ids.map(&:to_s)
+        taxons = Spree::Taxon.where(id: taxons_ids.to_s.split(','))
+        taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
     end
   end

data/app/helpers/spree/products_helper.rb

@@ -67,7 +67,7 @@ module Spree
       cache_key_elements = common_product_cache_keys
       cache_key_elements += [
         product.cache_key_with_version,
-        product.possible_promotions
+        product.possible_promotions.map(&:cache_key)
       ]
 
       cache_key_elements.compact.join('/')
@@ -79,8 +79,9 @@ module Spree
       string.slice(0..449) + '...'
     end
 
-    def available_status(product) # will return a human readable string
-      return Spree.t(:discontinued)  if product.discontinued?
+    # will return a human readable string
+    def available_status(product)
+      return Spree.t(:discontinued) if product.discontinued?
       return Spree.t(:deleted) if product.deleted?
 
       if product.available?
@@ -116,16 +117,16 @@ module Spree
     def related_products
       return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
 
-      @_related_products ||= @product.
-                             related_products.
-                             includes(
-                               :tax_category,
-                               master: [
-                                 :prices,
-                                 images: { attachment_attachment: :blob },
-                               ]
-                             ).
-                             limit(Spree::Config[:products_per_page])
+      @related_products ||= @product.
+                            related_products.
+                            includes(
+                              :tax_category,
+                              master: [
+                                :prices,
+                                images: { attachment_attachment: :blob },
+                              ]
+                            ).
+                            limit(Spree::Config[:products_per_page])
     end
 
     def product_available_in_currency?
@@ -145,7 +146,7 @@ module Spree
     end
 
     def variants_option_types_presenter(variants, product)
-      @_variants_option_types_presenter ||= begin
+      @variants_option_types_presenter ||= begin
         option_types = Spree::Variants::OptionTypesFinder.new(variant_ids: variants.map(&:id)).execute
 
         Spree::Variants::OptionTypesPresenter.new(option_types, variants, product)

data/app/models/concerns/spree/product_scopes.rb

@@ -81,7 +81,7 @@ 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)).
+          where('spree_products_taxons.taxon_id' => taxon.cached_self_and_descendants_ids).
           order('spree_products_taxons.position ASC')
       end
 
@@ -221,7 +221,7 @@ module Spree
 
       # specifically avoid having an order for taxon search (conflicts with main order)
       def self.prepare_taxon_conditions(taxons)
-        ids = taxons.map { |taxon| taxon.self_and_descendants.pluck(:id) }.flatten.uniq
+        ids = taxons.map(&:cached_self_and_descendants_ids).flatten.uniq
         joins(:classifications).where(Classification.table_name => { taxon_id: ids })
       end
       private_class_method :prepare_taxon_conditions

data/app/models/spree/product.rb

@@ -111,7 +111,7 @@ module Spree
 
     alias options product_option_types
 
-    self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
+    self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
     self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
@@ -341,7 +341,7 @@ module Spree
           price: master.price
         )
       end
-      throw(:abort) unless save
+      save
     end
 
     def ensure_master

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -23,7 +23,7 @@ module Spree
           order   = line_item.order
 
           # Prevent negative order totals
-          amounts << order.amount - order.adjustments.sum(:amount).abs if order.adjustments.any?
+          amounts << order.amount - order.adjustments.eligible.sum(:amount).abs if order.adjustments.eligible.any?
 
           amounts.min * -1
         end

data/app/models/spree/taxon.rb

@@ -74,6 +74,12 @@ module Spree
       ancestor_chain + name.to_s
     end
 
+    def cached_self_and_descendants_ids
+      Rails.cache.fetch("#{cache_key_with_version}/descendant-ids") do
+        self_and_descendants.ids
+      end
+    end
+
     # awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
     # node so that its resulting position matches the observable 0-indexed position.
     # ** Note ** no :position column needed - a_n_s doesn't handle the reordering if

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.5'
+    '4.1.6'
   end
 end

data/spree_core.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
-  s.add_dependency 'twitter_cldr', '>= 4.3', '< 6.0'
+  s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -309,7 +309,7 @@ dependencies:
         version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -319,7 +319,7 @@ dependencies:
         version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement