solidus_core 2.11.10 → 3.3.1

data/app/models/spree/promotion_code/batch_builder.rb

@@ -10,20 +10,6 @@ class ::Spree::PromotionCode::BatchBuilder
     sample_characters: ('a'..'z').to_a + (2..9).to_a.map(&:to_s)
   }
 
-  [:random_code_length, :batch_size, :sample_characters].each do |attr|
-    define_singleton_method(attr) do
-      Spree::Deprecation.warn "#{name}.#{attr} is deprecated. Use #{name}::DEFAULT_OPTIONS[:#{attr}] instead"
-      DEFAULT_OPTIONS[attr]
-    end
-
-    define_singleton_method(:"#{attr}=") do |val|
-      Spree::Deprecation.warn "#{name}.#{attr}= is deprecated. Use #{name}::DEFAULT_OPTIONS[:#{attr}]= instead"
-      DEFAULT_OPTIONS[attr] = val
-    end
-
-    delegate attr, to: self
-  end
-
   def initialize(promotion_code_batch, options = {})
     @promotion_code_batch = promotion_code_batch
     options.assert_valid_keys(*DEFAULT_OPTIONS.keys)

data/app/models/spree/promotion_code.rb

@@ -5,13 +5,13 @@ class Spree::PromotionCode < Spree::Base
   belongs_to :promotion_code_batch, class_name: "Spree::PromotionCodeBatch", optional: true
   has_many :adjustments
 
+  before_validation :normalize_code
+
   validates :value, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
   validates :promotion, presence: true
   validate :promotion_not_apply_automatically, on: :create
 
-  before_save :normalize_code
-
-  self.whitelisted_ransackable_attributes = ['value']
+  self.allowed_ransackable_attributes = ['value']
 
   # Whether the promotion code has exceeded its usage restrictions
   #
@@ -28,10 +28,14 @@ class Spree::PromotionCode < Spree::Base
   # @param excluded_orders [Array<Spree::Order>] Orders to exclude from usage count
   # @return [Integer] usage count
   def usage_count(excluded_orders: [])
-    adjustments.
-    eligible.
-    in_completed_orders(excluded_orders: excluded_orders).
-    count(:order_id)
+    promotion.
+      discounted_orders.
+      complete.
+      where.not(spree_orders: { state: :canceled }).
+      joins(:order_promotions).
+      where(spree_orders_promotions: { promotion_code_id: self.id }).
+      where.not(id: excluded_orders.map(&:id)).
+      count
   end
 
   def usage_limit

data/app/models/spree/promotion_handler/cart.rb

@@ -33,23 +33,43 @@ module Spree
       private
 
       def promotions
-        connected_order_promotions | sale_promotions
+        promos = connected_order_promotions | sale_promotions
+        promos.flat_map(&:promotion_actions).group_by(&:preload_relations).each do |preload_relations, actions|
+          preload(records: actions, associations: preload_relations)
+        end
+        promos.flat_map(&:promotion_rules).group_by(&:preload_relations).each do |preload_relations, rules|
+          preload(records: rules, associations: preload_relations)
+        end
+        promos
+      end
+
+      def preload(records:, associations:)
+        if Rails::VERSION::MAJOR >= 7
+          ActiveRecord::Associations::Preloader.new(records: records, associations: associations).call
+        else
+          ActiveRecord::Associations::Preloader.new.preload(records, associations)
+        end
       end
 
       def connected_order_promotions
-        Spree::Promotion.active.includes(:promotion_rules).
-          joins(:order_promotions).
-          where(spree_orders_promotions: { order_id: order.id }).readonly(false).to_a
+        order.promotions.active.includes(promotion_includes)
       end
 
       def sale_promotions
-        Spree::Promotion.where(apply_automatically: true).active.includes(:promotion_rules)
+        Spree::Promotion.where(apply_automatically: true).active.includes(promotion_includes)
       end
 
       def promotion_code(promotion)
-        order_promotion = Spree::OrderPromotion.where(order: order, promotion: promotion).first
+        order_promotion = order.order_promotions.detect { |op| op.promotion_id == promotion.id }
         order_promotion.present? ? order_promotion.promotion_code : nil
       end
+
+      def promotion_includes
+        [
+          :promotion_rules,
+          :promotion_actions,
+        ]
+      end
     end
   end
 end

data/app/models/spree/promotion_rule.rb

@@ -14,9 +14,14 @@ module Spree
     validates :promotion, presence: true
     validate :unique_per_promotion, on: :create
 
+    def preload_relations
+      []
+    end
+
     def self.for(promotable)
       all.select { |rule| rule.applicable?(promotable) }
     end
+    deprecate :for, "Please select promotion rules by their applicable status on the promotable instead."
 
     def applicable?(_promotable)
       raise NotImplementedError, "applicable? should be implemented in a sub-class of Spree::PromotionRule"

data/app/models/spree/property.rb

@@ -11,7 +11,7 @@ module Spree
 
     after_touch :touch_all_products
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     private
 

data/app/models/spree/refund.rb

@@ -15,11 +15,6 @@ module Spree
     validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create
 
     attr_reader :perform_response
-    attr_accessor :perform_after_create
-
-    after_create :set_perform_after_create_default
-    after_create :perform!
-    after_create :clear_perform_after_create
 
     scope :non_reimbursement, -> { where(reimbursement_id: nil) }
 
@@ -36,6 +31,14 @@ module Spree
       end
     end
 
+    # Sets this price's amount to a new value, parsing it if the new value is
+    # a string.
+    #
+    # @param price [String, #to_d] a new amount
+    def amount=(price)
+      self[:amount] = Spree::LocalizedNumber.parse(price)
+    end
+
     def description
       payment.payment_method.name
     end
@@ -45,29 +48,14 @@ module Spree
     # Attempts to perform the refund,
     # raises an error if the refund fails.
     def perform!
-      return true if perform_after_create == false
       return true if transaction_id.present?
 
-      # This is needed otherwise set_perform_after_create_default callback
-      # will print a deprecation warning when save! creates a record
-      self.perform_after_create = false unless persisted?
-
       credit_cents = money.cents
 
       @perform_response = process!(credit_cents)
-
-      @response = Spree::DeprecatedInstanceVariableProxy.new(
-        self,
-        :perform_response,
-        :@response,
-        Spree::Deprecation,
-        "Please, do not use Spree::Refund @response anymore, use Spree::Refund#perform_response"
-      )
-
       log_entries.build(details: perform_response.to_yaml)
 
       self.transaction_id = perform_response.authorization
-
       save!
 
       update_order
@@ -75,38 +63,6 @@ module Spree
 
     private
 
-    # This callback takes care of setting the behavior that determines if it is needed
-    # to execute the perform! callback after_create.
-    # Existing code that creates refund without explicitely passing
-    #
-    # perform_after_create: false
-    #
-    # as attribute will still call perform! but a deprecation warning is emitted in order
-    # to ask users to change their code with the new supported behavior.
-    def set_perform_after_create_default
-      return true if perform_after_create == false
-
-      Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-        From Solidus v3.0 onwards, #perform! will need to be explicitly called when creating new
-        refunds. Please, change your code from:
-
-          Spree::Refund.create(your: attributes)
-
-        to:
-
-          Spree::Refund.create(your: attributes, perform_after_create: false).perform!
-      WARN
-
-      self.perform_after_create = true
-    end
-
-    # This is needed to avoid that when you create a refund with perform_after_create = false,
-    # it's not possibile to call perform! on that instance, since the value of this attribute
-    # will remain false until a reload of the instance.
-    def clear_perform_after_create
-      @perform_after_create = nil
-    end
-
     # return an activemerchant response object if successful or else raise an error
     def process!(credit_cents)
       response = if payment.payment_method.payment_profiles_supported?

data/app/models/spree/reimbursement.rb

@@ -51,14 +51,6 @@ module Spree
     class_attribute :reimbursement_performer
     self.reimbursement_performer = ReimbursementPerformer
 
-    # These are called if the call to "reimburse!" succeeds.
-    class_attribute :reimbursement_success_hooks
-    self.reimbursement_success_hooks = []
-
-    # These are called if the call to "reimburse!" fails.
-    class_attribute :reimbursement_failure_hooks
-    self.reimbursement_failure_hooks = []
-
     include ::Spree::Config.state_machines.reimbursement
 
     class << self
@@ -91,10 +83,7 @@ module Spree
       total - paid_amount
     end
 
-    def perform!(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #perform on #{self} without created_by is deprecated")
-      end
+    def perform!(created_by:)
       reimbursement_tax_calculator.call(self)
       reload
       update!(total: calculated_total)
@@ -103,22 +92,10 @@ module Spree
 
       if unpaid_amount_within_tolerance?
         reimbursed!
-        Spree::Event.fire 'reimbursement_reimbursed', reimbursement: self
-        if reimbursement_success_hooks.any?
-          Spree::Deprecation.warn \
-            "reimbursement_success_hooks are deprecated. Please remove them " \
-            "and subscribe to `reimbursement_reimbursed` event instead", caller(1)
-        end
-        reimbursement_success_hooks.each { |hook| hook.call self }
+        Spree::Bus.publish :reimbursement_reimbursed, reimbursement: self
       else
         errored!
-        Spree::Event.fire 'reimbursement_errored', reimbursement: self
-        if reimbursement_failure_hooks.any?
-          Spree::Deprecation.warn \
-            "reimbursement_failure_hooks are deprecated. Please remove them " \
-            "and subscribe to `reimbursement_errored` event instead", caller(1)
-        end
-        reimbursement_failure_hooks.each { |hook| hook.call self }
+        Spree::Bus.publish :reimbursement_errored, reimbursement: self
       end
 
       if errored?
@@ -126,10 +103,7 @@ module Spree
       end
     end
 
-    def simulate(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #simulate on #{self} without created_by is deprecated")
-      end
+    def simulate(created_by:)
       reimbursement_simulator_tax_calculator.call(self)
       reload
       update!(total: calculated_total)
@@ -154,10 +128,7 @@ module Spree
     # @api public
     # @param [Spree.user_class] created_by the user that is performing this action
     # @return [void]
-    def return_all(created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #return_all on #{self} without created_by is deprecated")
-      end
+    def return_all(created_by:)
       return_items.each(&:accept!)
       save!
       perform!(created_by: created_by)
@@ -168,15 +139,6 @@ module Spree
     #
     # @return [Spree::StoreCreditCategory]
     def store_credit_category
-      if Spree::Config.use_legacy_store_credit_reimbursement_category_name
-        Spree::Deprecation.warn("Using the legacy reimbursement_category_name is deprecated. "\
-          "Set Spree::Config.use_legacy_store_credit_reimbursement_category_name to false to use "\
-          "the new version instead.", caller)
-
-        name = Spree::StoreCreditCategory.reimbursement_category_name
-        return Spree::StoreCreditCategory.find_by(name: name) || Spree::StoreCreditCategory.first
-      end
-
       Spree::StoreCreditCategory.find_by(name: Spree::StoreCreditCategory::REIMBURSEMENT)
     end
 

data/app/models/spree/reimbursement_performer.rb

@@ -11,18 +11,12 @@ module Spree
       # - #description
       # - #display_amount
       # so they can be displayed in the Admin UI appropriately.
-      def simulate(reimbursement, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #simulate on #{self} without created_by is deprecated")
-        end
+      def simulate(reimbursement, created_by:)
         execute(reimbursement, true, created_by: created_by)
       end
 
       # Actually perform the reimbursement
-      def perform(reimbursement, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #perform on #{self} without created_by is deprecated")
-        end
+      def perform(reimbursement, created_by:)
         execute(reimbursement, false, created_by: created_by)
       end
 

data/app/models/spree/reimbursement_type/credit.rb

@@ -5,10 +5,7 @@ module Spree
     extend Spree::ReimbursementType::ReimbursementHelpers
 
     class << self
-      def reimburse(reimbursement, return_items, simulate, created_by: nil)
-        unless created_by
-          Spree::Deprecation.warn("Calling #reimburse on #{self} without created_by is deprecated")
-        end
+      def reimburse(reimbursement, return_items, simulate, created_by:)
         unpaid_amount = return_items.sum(&:total).round(2, :down)
         reimbursement_list, _unpaid_amount = create_credits(reimbursement, unpaid_amount, simulate, created_by: created_by)
         reimbursement_list

data/app/models/spree/reimbursement_type/reimbursement_helpers.rb

@@ -34,8 +34,7 @@ module Spree
       refund = reimbursement.refunds.build({
         payment: payment,
         amount: amount,
-        reason: Spree::RefundReason.return_processing_reason,
-        perform_after_create: false
+        reason: Spree::RefundReason.return_processing_reason
       })
 
       if simulate

data/app/models/spree/reimbursement_type/store_credit.rb

@@ -4,10 +4,7 @@ class Spree::ReimbursementType::StoreCredit < Spree::ReimbursementType
   extend Spree::ReimbursementType::ReimbursementHelpers
 
   class << self
-    def reimburse(reimbursement, return_items, simulate, created_by: nil)
-      unless created_by
-        Spree::Deprecation.warn("Calling #reimburse on #{self} without created_by is deprecated")
-      end
+    def reimburse(reimbursement, return_items, simulate, created_by:)
       unpaid_amount = return_items.sum(&:total).to_d.round(2, :down)
       payments = store_credit_payments(reimbursement)
       reimbursement_list = []

data/app/models/spree/return_authorization.rb

@@ -25,16 +25,13 @@ module Spree
     include ::Spree::Config.state_machines.return_authorization
 
     extend DisplayMoney
-    money_methods :pre_tax_total, :amount, :total_excluding_vat
-    deprecate display_pre_tax_total: :display_total_excluding_vat, deprecator: Spree::Deprecation
+    money_methods :amount, :total_excluding_vat
 
-    self.whitelisted_ransackable_attributes = ['memo']
+    self.allowed_ransackable_attributes = ['memo']
 
     def total_excluding_vat
       return_items.sum(&:total_excluding_vat)
     end
-    alias pre_tax_total total_excluding_vat
-    deprecate pre_tax_total: :total_excluding_vat, deprecator: Spree::Deprecation
 
     def amount
       return_items.sum(:amount)

data/app/models/spree/return_item.rb

@@ -30,7 +30,7 @@ module Spree
     self.refund_amount_calculator = Calculator::Returns::DefaultRefundAmount
 
     belongs_to :return_authorization, inverse_of: :return_items, optional: true
-    belongs_to :inventory_unit, inverse_of: :return_items, optional: true
+    belongs_to :inventory_unit, inverse_of: :return_items
     belongs_to :exchange_variant, class_name: 'Spree::Variant', optional: true
     belongs_to :exchange_inventory_unit, class_name: 'Spree::InventoryUnit', inverse_of: :original_return_item, optional: true
     belongs_to :customer_return, inverse_of: :return_items, optional: true
@@ -42,7 +42,6 @@ module Spree
     validate :eligible_exchange_variant
     validate :belongs_to_same_customer_order
     validate :validate_acceptance_status_for_reimbursement
-    validates :inventory_unit, presence: true
     validate :validate_no_other_completed_return_items
 
     after_create :cancel_others, unless: :cancelled?
@@ -81,8 +80,7 @@ module Spree
     include ::Spree::Config.state_machines.return_item_acceptance
 
     extend DisplayMoney
-    money_methods :pre_tax_amount, :amount, :total, :total_excluding_vat
-    deprecate display_pre_tax_amount: :display_total_excluding_vat, deprecator: Spree::Deprecation
+    money_methods :amount, :total, :total_excluding_vat
 
     # @return [Boolean] true when this retur item is in a complete reception
     #   state
@@ -90,14 +88,6 @@ module Spree
       COMPLETED_RECEPTION_STATUSES.map(&:to_s).include?(reception_status.to_s)
     end
 
-    def skip_customer_return_processing=(value)
-      @skip_customer_return_processing = value
-      Deprecation.warn \
-        'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
-        'nothing, and #process_inventory_unit! will restore calling ' \
-        'customer_return#process_return!', caller(1)
-    end
-
     # @param inventory_unit [Spree::InventoryUnit] the inventory for which we
     #   want a return item
     # @return [Spree::ReturnItem] a valid return item for the given inventory
@@ -134,8 +124,6 @@ module Spree
     def total_excluding_vat
       amount - included_tax_total
     end
-    alias pre_tax_amount total_excluding_vat
-    deprecate pre_tax_amount: :total_excluding_vat, deprecator: Spree::Deprecation
 
     # @note This uses the exchange_variant_engine configured on the class.
     # @param stock_locations [Array<Spree::StockLocation>] the stock locations to check
@@ -206,13 +194,6 @@ module Spree
         customer_return.stock_location.restock(inventory_unit.variant, 1, customer_return)
       end
 
-      unless @skip_customer_return_processing.nil?
-        Deprecation.warn \
-          'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
-          'nothing, and #process_inventory_unit! will restore calling ' \
-          'customer_return#process_return!'
-      end
-
       customer_return&.process_return!
     end
 
@@ -272,10 +253,9 @@ module Spree
       }).where.not(id: id).first
 
       if other_return_item && (new_record? || COMPLETED_RECEPTION_STATUSES.include?(reception_status.to_sym))
-        errors.add(:inventory_unit, :other_completed_return_item_exists, {
+        errors.add(:inventory_unit, :other_completed_return_item_exists,
           inventory_unit_id: inventory_unit_id,
-          return_item_id: other_return_item.id
-        })
+          return_item_id: other_return_item.id)
       end
     end
 

data/app/models/spree/shipment.rb

@@ -41,8 +41,8 @@ module Spree
 
     include ::Spree::Config.state_machines.shipment
 
-    self.whitelisted_ransackable_associations = ['order']
-    self.whitelisted_ransackable_attributes = ['number']
+    self.allowed_ransackable_associations = ['order']
+    self.allowed_ransackable_attributes = ['number']
 
     delegate :tax_category, :tax_category_id, to: :selected_shipping_rate, allow_nil: true
 
@@ -62,18 +62,11 @@ module Spree
 
     extend DisplayMoney
     money_methods(
-      :cost, :amount, :discounted_cost, :final_price, :item_cost,
+      :cost, :amount, :item_cost,
       :total, :total_before_tax,
     )
-    deprecate display_discounted_cost: :display_total_before_tax, deprecator: Spree::Deprecation
-    deprecate display_final_price: :display_total, deprecator: Spree::Deprecation
     alias_attribute :amount, :cost
 
-    def add_shipping_method(shipping_method, selected = false)
-      shipping_rates.create(shipping_method: shipping_method, selected: selected, cost: cost)
-    end
-    deprecate :add_shipping_method, deprecator: Spree::Deprecation
-
     def after_cancel
       manifest.each { |item| manifest_restock(item) }
     end
@@ -90,20 +83,11 @@ module Spree
       order ? order.currency : Spree::Config[:currency]
     end
 
-    def discounted_cost
-      cost + promo_total
-    end
-    deprecate discounted_cost: :total_before_tax, deprecator: Spree::Deprecation
-    alias discounted_amount discounted_cost
-    deprecate discounted_amount: :total_before_tax, deprecator: Spree::Deprecation
-
     # @return [BigDecimal] the amount of this shipment, taking into
     #   consideration all its adjustments.
     def total
       cost + adjustment_total
     end
-    alias final_price total
-    deprecate final_price: :total, deprecator: Spree::Deprecation
 
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
@@ -116,14 +100,10 @@ module Spree
     def total_excluding_vat
       total_before_tax - included_tax_total
     end
-    alias pre_tax_amount total_excluding_vat
-    deprecate pre_tax_amount: :total_excluding_vat, deprecator: Spree::Deprecation
 
     def total_with_items
       total + item_cost
     end
-    alias final_price_with_items total_with_items
-    deprecate final_price_with_items: :total_with_items, deprecator: Spree::Deprecation
 
     def editable_by?(_user)
       !shipped?
@@ -320,43 +300,10 @@ module Spree
       end
     end
 
-    def update!(order_or_attrs)
-      if order_or_attrs.is_a?(Spree::Order)
-        Spree::Deprecation.warn "Calling Shipment#update! with an order to update the shipments state is deprecated. Please use Shipment#update_state instead."
-        if order_or_attrs.object_id != order.object_id
-          Spree::Deprecation.warn "Additionally, update! is being passed an instance of order which isn't the same object as the shipment's order association"
-        end
-        update_state
-      else
-        super
-      end
-    end
-
-    def transfer_to_location(variant, quantity, stock_location)
-      Spree::Deprecation.warn("Please use the Spree::FulfilmentChanger class instead of Spree::Shipment#transfer_to_location", caller)
-      new_shipment = order.shipments.create!(stock_location: stock_location)
-      transfer_to_shipment(variant, quantity, new_shipment)
-    end
-
-    def transfer_to_shipment(variant, quantity, shipment_to_transfer_to)
-      Spree::Deprecation.warn("Please use the Spree::FulfilmentChanger class instead of Spree::Shipment#transfer_to_location", caller)
-      Spree::FulfilmentChanger.new(
-        current_shipment: self,
-        desired_shipment: shipment_to_transfer_to,
-        variant: variant,
-        quantity: quantity
-      ).run!
-    end
-
     def requires_shipment?
       !stock_location || stock_location.fulfillable?
     end
 
-    def address
-      Spree::Deprecation.warn("Calling Shipment#address is deprecated. Use Order#ship_address instead", caller)
-      order.ship_address if order
-    end
-
     private
 
     def finalize_pending_inventory_units

data/app/models/spree/shipping_method.rb

@@ -6,11 +6,6 @@ module Spree
   class ShippingMethod < Spree::Base
     include Spree::SoftDeletable
     include Spree::CalculatedAdjustments
-    DISPLAY = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
-      [:both, :front_end, :back_end],
-      "Spree::ShippingMethod::DISPLAY is deprecated",
-      Spree::Deprecation
-    )
 
     has_many :shipping_method_categories, dependent: :destroy
     has_many :shipping_categories, through: :shipping_method_categories
@@ -95,26 +90,6 @@ module Spree
       tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
     end
 
-    def display_on
-      if available_to_users?
-        "both"
-      else
-        "back_end"
-      end
-    end
-    deprecate display_on: :available_to_users?, deprecator: Spree::Deprecation
-
-    def display_on=(value)
-      self.available_to_users = (value != "back_end")
-    end
-    deprecate 'display_on=': :available_to_users=, deprecator: Spree::Deprecation
-
-    # Some shipping methods are only meant to be set via backend
-    def frontend?
-      available_to_users?
-    end
-    deprecate frontend?: :available_to_users?, deprecator: Spree::Deprecation
-
     private
 
     def at_least_one_shipping_category

data/app/models/spree/shipping_rate.rb

@@ -19,8 +19,6 @@ module Spree
     delegate :code, to: :shipping_method, prefix: true
     alias_attribute :amount, :cost
 
-    alias_method :discounted_amount, :amount
-    deprecate discounted_amount: :total_before_tax, deprecator: Spree::Deprecation
     alias_method :total_before_tax, :amount
 
     extend DisplayMoney

data/app/models/spree/shipping_rate_tax.rb

@@ -5,7 +5,7 @@ module Spree
   # @attr [Spree::ShippingRate] shipping_rate The shipping rate to be taxed
   # @attr [Spree::TaxRate] tax_rate The tax rate used to calculate the tax amount
   # @since 1.3.0
-  # @see Spree::Tax::ShippingRateTaxer
+  # @see Spree::Stock::Estimator
   class ShippingRateTax < Spree::Base
     belongs_to :shipping_rate, class_name: "Spree::ShippingRate", optional: true
     belongs_to :tax_rate, class_name: "Spree::TaxRate", optional: true

data/app/models/spree/state.rb

@@ -14,12 +14,8 @@ module Spree
         )
       )
     end
-    class << self
-      alias_method :find_all_by_name_or_abbr, :with_name_or_abbr
-      deprecate find_all_by_name_or_abbr: :with_name_or_abbr, deprecator: Spree::Deprecation
-    end
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     # table of { country.id => [ state.id , state.name ] }, arrays sorted by name
     # blank is added elsewhere, if needed

data/app/models/spree/stock/allocator/on_hand_first.rb

@@ -7,11 +7,11 @@ module Spree
         def allocate_inventory(desired)
           # Allocate any available on hand inventory
           on_hand = allocate_on_hand(desired)
-          desired -= on_hand.values.sum if on_hand.present?
+          desired -= on_hand.values.reduce(&:+) if on_hand.present?
 
           # Allocate remaining desired inventory from backorders
           backordered = allocate_backordered(desired)
-          desired -= backordered.values.sum if backordered.present?
+          desired -= backordered.values.reduce(&:+) if backordered.present?
 
           # If all works at this point desired must be empty
           [on_hand, backordered, desired]