spree_core 4.1.4 → 4.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14259887630a60331633df140cfe4f7b9e94b9ecdf95342c5e8a31011dbfb807
-  data.tar.gz: 2801ca34a2ad369726b829ea9e3decf00ae64c9fcc4cc673cf04e0dc0aa826c5
+  metadata.gz: 735a7c4cad6166518bb05cc45fcc5a2f303e1b4a11f5ec9ae1e17a6df5916142
+  data.tar.gz: a62c2b5fec62e7c9bf7971198f3805c573785c9e9768d88c61b3ae89b578c31d
 SHA512:
-  metadata.gz: f644cd935bca9d371a3a558ffe76994143bc8af738ac9ff8621a778eef743d79339b3f5bda697e84a287c51e12e235bac989c500dd4923ca08f52a89ba8d80ac
-  data.tar.gz: 62203be51964aa4ccd9ea69a5e5fd47ea7408c6028e257a5c30a7769de7178127aecef002305731f58d5e676bd209c15b776d182246f23dc07a4a0679801d5d3
+  metadata.gz: 25b68dc35a114eaa937dc25fc06576065d8b56baa23d4839cdfa401c08fb5f85638e65d924cba0f9f84b9585761eb3855cf938811c288578968aee2d0ef3e2bb
+  data.tar.gz: 67270a8f7d20847ddcced170c3ebb82b419d89ffff202905d4a9161b13cd526a954b67367bf925133822a0903e5a7a41e81f2f11e4abadf7d9b375b5bdf54793

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

@@ -9,6 +9,7 @@ module Spree
         @price            = String(params.dig(:filter, :price)).split(',').map(&:to_f)
         @currency         = params[:currency] || current_currency
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
+        @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
         @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
         @option_value_ids = params.dig(:filter, :option_value_ids)
@@ -22,6 +23,7 @@ module Spree
         products = by_skus(products)
         products = by_price(products)
         products = by_taxons(products)
+        products = by_concat_taxons(products)
         products = by_name(products)
         products = by_options(products)
         products = by_option_value_ids(products)
@@ -34,7 +36,8 @@ module Spree
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :option_value_ids, :scope, :sort_by, :deleted, :discontinued
+      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options,
+                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued
 
       def ids?
         ids.present?
@@ -52,6 +55,10 @@ module Spree
         taxons.present?
       end
 
+      def concat_taxons?
+        concat_taxons.present?
+      end
+
       def name?
         name.present?
       end
@@ -99,7 +106,20 @@ 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_concat_taxons(products)
+        return products unless concat_taxons?
+
+        product_ids = Spree::Product.
+                      joins(:classifications).
+                      where(Classification.table_name => { taxon_id: concat_taxons }).
+                      group("#{Spree::Product.table_name}.id").
+                      having("COUNT(#{Spree::Product.table_name}.id) = ?", concat_taxons.length).
+                      ids
+
+        products.where(id: product_ids)
       end
 
       def by_name(products)
@@ -111,9 +131,11 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        options.map do |key, value|
-          products.with_option_value(key, value)
-        end.inject(:&)
+        products.where(
+          id: options.map do |key, value|
+            products.with_option_value(key, value).ids
+          end.flatten.compact.uniq
+        )
       end
 
       def by_option_value_ids(products)
@@ -142,13 +164,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 +194,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/base_helper.rb

@@ -111,7 +111,9 @@ module Spree
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
-      if product.default_variant.images.any?
+      if product.images.any?
+        product.images.first
+      elsif product.default_variant.images.any?
         product.default_variant.images.first
       elsif product.variant_images.any?
         product.variant_images.first

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/app_configuration.rb

@@ -44,6 +44,7 @@ module Spree
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
     preference :currency, :string, default: 'USD'
     preference :default_country_id, :integer
+    preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
     preference :layout, :string, default: 'spree/layouts/spree_application'

data/app/models/spree/credit_card.rb

@@ -24,10 +24,9 @@ module Spree
     attribute :month, ActiveRecord::Type::Integer.new
     attribute :year,  ActiveRecord::Type::Integer.new
 
-    attr_reader :number
+    attr_reader :number, :verification_value
     attr_accessor :encrypted_data,
                   :imported,
-                  :verification_value,
                   :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
@@ -101,9 +100,11 @@ module Spree
                        end
     end
 
+    def verification_value=(value)
+      @verification_value = value.to_s.gsub(/\s/, '')
+    end
+
     def set_last_digits
-      number.to_s.gsub!(/\s/, '')
-      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 

data/app/models/spree/preferences/preferable.rb

@@ -100,7 +100,7 @@ module Spree::Preferences::Preferable
       if value.is_a?(FalseClass) ||
           value.nil? ||
           value == 0 ||
-          value =~ /^(f|false|0)$/i ||
+          value&.to_s =~ /^(f|false|0)$/i ||
           (value.respond_to?(:empty?) && value.empty?)
         false
       else

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/app/models/spree/variant.rb

@@ -48,7 +48,8 @@ module Spree
       validates :cost_price
       validates :price
     end
-    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false }, allow_blank: true
+    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false },
+                    allow_blank: true, unless: :disable_sku_validation?
 
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
@@ -102,6 +103,11 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
+    self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont)
+
+    def self.product_name_or_sku_cont(query)
+      joins(:product).where("#{Product.table_name}.name LIKE :query OR sku LIKE :query", query: "%#{query}%")
+    end
 
     def available?
       !discontinued? && product.available?
@@ -226,7 +232,11 @@ module Spree
     end
 
     def in_stock?
-      Rails.cache.fetch(in_stock_cache_key) do
+      # Issue 10280
+      # Check if model responds to cache version and fall back to updated_at for older rails versions
+      # This makes sure a version is supplied when recyclable cache keys are disabled.
+      version = respond_to?(:cache_version) ? cache_version : updated_at.to_i
+      Rails.cache.fetch(in_stock_cache_key, version: version) do
         total_on_hand > 0
       end
     end
@@ -319,5 +329,9 @@ module Spree
     def clear_in_stock_cache
       Rails.cache.delete(in_stock_cache_key)
     end
+
+    def disable_sku_validation?
+      Spree::Config[:disable_sku_validation]
+    end
   end
 end

data/app/services/spree/checkout/get_shipping_rates.rb

@@ -7,9 +7,7 @@ module Spree
         run :reload_order
         run :ensure_shipping_address
         run :ensure_line_items_present
-        run :move_order_to_delivery_state
-        run :generate_shipping_rates
-        run :return_shipments
+        run :generate_or_return_shipping_rates
       end
 
       private
@@ -31,6 +29,11 @@ module Spree
         success(order: order)
       end
 
+      def generate_or_return_shipping_rates(order:)
+        generate_shipping_rates(order: order) if order.shipments.empty?
+        return_shipments(order: order)
+      end
+
       def generate_shipping_rates(order:)
         ApplicationRecord.transaction do
           order.create_proposed_shipments
@@ -42,13 +45,7 @@ module Spree
       end
 
       def return_shipments(order:)
-        success(order.shipments.includes([shipping_rates: :shipping_method]))
-      end
-
-      def move_order_to_delivery_state(order:)
-        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until order.state == 'delivery'
-
-        success(order: order)
+        success(order.reload.shipments.includes([shipping_rates: :shipping_method]))
       end
     end
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -138,7 +138,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend']
+      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -26,5 +26,6 @@ Spree.dependencies do |dependencies|
   # dependencies.cart_add_item_service = 'MyNewAwesomeService'
 end
 
+# Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.4'
+    '4.1.9'
   end
 end

data/spree_core.gemspec

@@ -6,17 +6,23 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
+  s.author      = 'Sean Schofield'
+  s.email       = 'sean@spreecommerce.com'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
+  s.homepage    = 'http://spreecommerce.org'
+  s.license     = 'BSD-3-Clause'
+
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
+    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
+  }
 
   s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
-  s.homepage    = 'http://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
-
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 
@@ -28,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.4.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
@@ -39,7 +45,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.4
+  version: 4.1.9
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -144,22 +144,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +303,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 +313,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
@@ -1089,8 +1083,12 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree/issues
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.9
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.9
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1105,8 +1103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []