solidus_core 2.11.1 → 3.0.0.rc2

data/app/models/spree/order/payments.rb

@@ -37,14 +37,14 @@ module Spree
 
       private
 
-      def process_payments_with(method)
+      def process_payments_with(method_name)
         # Don't run if there is nothing to pay.
         return true if payment_total >= total
 
         unprocessed_payments.each do |payment|
           break if payment_total >= total
 
-          payment.public_send(method)
+          payment.public_send(method_name)
         end
       rescue Core::GatewayError => error
         result = !!Spree::Config[:allow_checkout_on_gateway_error]

data/app/models/spree/order_cancellations.rb

@@ -23,16 +23,10 @@ class Spree::OrderCancellations
   # @api public
   #
   # @param [Array<InventoryUnit>] inventory_units the inventory units to be short shipped
-  # @param [Spree.user_class] whodunnit (deprecated) the system or person that is short shipping the inventory unit
   # @param [Spree.user_class] created_by the system or person that is short shipping the inventory unit
   #
   # @return [Array<UnitCancel>] the units that have been canceled due to short shipping
-  def short_ship(inventory_units, whodunnit: nil, created_by: nil)
-    if whodunnit
-      created_by ||= whodunnit
-      Spree::Deprecation.warn("Calling #short_ship on #{self} with whodunnit is deprecated, use created_by instead")
-    end
-
+  def short_ship(inventory_units, created_by: nil)
     if inventory_units.map(&:order_id).uniq != [@order.id]
       raise ArgumentError, "Not all inventory units belong to this order"
     end
@@ -65,16 +59,10 @@ class Spree::OrderCancellations
   #
   # @param [InventoryUnit] inventory_unit the inventory unit to be canceled
   # @param [String] reason the reason that you are canceling the inventory unit
-  # @param [Spree.user_class] whodunnit (deprecated) the system or person that is canceling the inventory unit
   # @param [Spree.user_class] created_by the system or person that is canceling the inventory unit
   #
   # @return [UnitCancel] the unit that has been canceled
-  def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, whodunnit: nil, created_by: nil)
-    if whodunnit
-      created_by ||= whodunnit
-      Spree::Deprecation.warn("Calling #cancel_unit on #{self} with whodunnit is deprecated, use created_by instead")
-    end
-
+  def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, created_by: nil)
     unit_cancel = nil
 
     Spree::OrderMutex.with_lock!(@order) do
@@ -96,10 +84,7 @@ class Spree::OrderCancellations
   # @param [Array<InventoryUnit>] inventory_units the inventory units to be reimbursed
   # @param [Spree.user_class] created_by the user that is performing this action
   # @return [Reimbursement] the reimbursement for inventory being canceled
-  def reimburse_units(inventory_units, created_by: nil)
-    unless created_by
-      Spree::Deprecation.warn("Calling #reimburse_units on #{self} without created_by is deprecated")
-    end
+  def reimburse_units(inventory_units, created_by:)
     reimbursement = nil
 
     Spree::OrderMutex.with_lock!(@order) do
@@ -113,12 +98,7 @@ class Spree::OrderCancellations
 
   private
 
-  def short_ship_unit(inventory_unit, whodunnit: nil, created_by: nil)
-    if whodunnit
-      created_by ||= whodunnit
-      Spree::Deprecation.warn("Calling #short_ship_unit on #{self} with whodunnit is deprecated, use created_by instead")
-    end
-
+  def short_ship_unit(inventory_unit, created_by: nil)
     unit_cancel = Spree::UnitCancel.create!(
       inventory_unit: inventory_unit,
       reason: Spree::UnitCancel::SHORT_SHIP,

data/app/models/spree/order_merger.rb

@@ -128,7 +128,7 @@ module Spree
     # @param [Spree::LineItem] line_item The line item which could not be saved
     # @return [void]
     def handle_error(line_item)
-      order.errors[:base] << line_item.errors.full_messages
+      order.errors.add(:base, line_item.errors.full_messages)
     end
 
     # Save the order totals after merge

data/app/models/spree/order_updater.rb

@@ -3,7 +3,7 @@
 module Spree
   class OrderUpdater
     attr_reader :order
-    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :update_hooks, :quantity, to: :order
+    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :quantity, to: :order
 
     def initialize(order)
       @order = order
@@ -26,20 +26,11 @@ module Spree
           update_shipments
           update_shipment_state
         end
-        run_hooks if update_hooks.any?
         Spree::Event.fire 'order_recalculated', order: order
         persist_totals
       end
     end
 
-    def run_hooks
-      Spree::Deprecation.warn \
-        "This method is deprecated. Please run your hooks by subscribing " \
-        "to `order_recalculated` and/or `order_finalized` events instead, depending " \
-        " on when OrderUpdater#run_hooks was called.", caller(1)
-      update_hooks.each { |hook| order.send hook }
-    end
-
     # Updates the +shipment_state+ attribute according to the following logic:
     #
     # shipped   when all Shipments are in the "shipped" state
@@ -186,7 +177,7 @@ module Spree
     end
 
     def persist_totals
-      order.save!(validate: Spree::Config.run_order_validations_on_order_updater)
+      order.save!
     end
 
     def log_state_change(name)

data/app/models/spree/payment.rb

@@ -8,9 +8,6 @@ module Spree
   class Payment < Spree::Base
     include Spree::Payment::Processing
 
-    alias_attribute :identifier, :number
-    deprecate :identifier, :identifier=, deprecator: Spree::Deprecation
-
     IDENTIFIER_CHARS    = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
@@ -168,9 +165,16 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        source.errors.each do |field, error|
-          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
+        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
+          source.errors.each do |error|
+            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{error.attribute}")
+            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error.message}")
+          end
+        else
+          source.errors.each do |field, error|
+            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
+            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
+          end
         end
       end
       if errors.any?

data/app/models/spree/payment/cancellation.rb

@@ -26,16 +26,10 @@ module Spree
       # @param payment [Spree::Payment] - the payment that should be canceled
       #
       def cancel(payment)
-        # For payment methods already implemeting `try_void`
-        if try_void_available?(payment.payment_method)
-          if response = payment.payment_method.try_void(payment)
-            payment.handle_void_response(response)
-          else
-            payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
-          end
+        if response = payment.payment_method.try_void(payment)
+          payment.handle_void_response(response)
         else
-          # For payment methods not yet implemeting `try_void`
-          deprecated_behavior(payment)
+          payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason).perform!
         end
       end
 
@@ -44,19 +38,6 @@ module Spree
       def refund_reason
         Spree::RefundReason.where(name: reason).first_or_create
       end
-
-      def try_void_available?(payment_method)
-        payment_method.respond_to?(:try_void) &&
-          payment_method.method(:try_void).owner != Spree::PaymentMethod
-      end
-
-      def deprecated_behavior(payment)
-        Spree::Deprecation.warn "#{payment.payment_method.class.name}#cancel is deprecated and will be removed. " \
-          'Please implement a `try_void` method instead that returns a response object if void succeeds ' \
-          'or `false|nil` if not. Solidus will refund the payment then.'
-        response = payment.payment_method.cancel(payment.response_code)
-        payment.handle_void_response(response)
-      end
     end
   end
 end

data/app/models/spree/payment_create.rb

@@ -7,7 +7,6 @@ module Spree
     # @param attributes [Hash,ActionController::Parameters] attributes which are assigned to the new payment
     #   * :payment_method_id Id of payment method used for this payment
     #   * :source_attributes Attributes used to build the source of this payment. Usually a {CreditCard}
-    #     * :existing_card_id (Integer) Deprecated: The id of an existing {CreditCard} object to use
     #     * :wallet_payment_source_id (Integer): The id of a {WalletPaymentSource} to use
     # @param request_env [Hash] rack env of user creating the payment
     # @param payment [Payment] Internal use only. Instead of making a new payment, change the attributes for an existing one.
@@ -29,13 +28,7 @@ module Spree
       @payment.request_env = @request_env if @request_env
       @payment.attributes = @attributes
 
-      if source_attributes[:existing_card_id].present?
-        Spree::Deprecation.warn(
-          "Passing existing_card_id to PaymentCreate is deprecated. Use wallet_payment_source_id instead.",
-          caller,
-        )
-        build_existing_card
-      elsif source_attributes[:wallet_payment_source_id].present?
+      if source_attributes[:wallet_payment_source_id].present?
         build_from_wallet_payment_source
       else
         build_source
@@ -67,11 +60,6 @@ module Spree
       build_from_payment_source(wallet_payment_source.payment_source)
     end
 
-    def build_existing_card
-      credit_card = available_cards.find(source_attributes[:existing_card_id])
-      build_from_payment_source(credit_card)
-    end
-
     def build_from_payment_source(payment_source)
       # FIXME: does this work?
       if source_attributes[:verification_value]

data/app/models/spree/payment_method.rb

@@ -18,19 +18,6 @@ module Spree
 
     acts_as_list
 
-    # @private
-    def self.const_missing(name)
-      if name == :DISPLAY
-        Spree::Deprecation.warn(
-          "#{self}::DISPLAY has been deprecated and will be removed in Solidus v3.",
-          caller
-        )
-        const_set(:DISPLAY, [:both, :front_end, :back_end])
-      else
-        super
-      end
-    end
-
     validates :name, :type, presence: true
 
     has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
@@ -67,51 +54,9 @@ module Spree
     end
 
     class << self
-      # @deprecated Use Spree::Config.environment.payment_methods instead
-      def providers
-        Spree::Deprecation.warn 'Spree::PaymentMethod.providers is deprecated and will be deleted in Solidus 3.0. ' \
-          'Please use Rails.application.config.spree.payment_methods instead'
-        Spree::Config.environment.payment_methods
-      end
-
-      # @deprecated Use {.active}, {.available_to_users}, and {.available_to_admin} scopes instead.
-      def available(display_on = nil, store: nil)
-        Spree::Deprecation.warn "Spree::PaymentMethod.available is deprecated."\
-          "Please use .active, .available_to_users, and .available_to_admin scopes instead."\
-          "For payment methods associated with a specific store, use Spree::PaymentMethod.available_to_store(your_store)"\
-          " as the base applying any further filtering"
-
-        display_on = display_on.to_s
-
-        available_payment_methods =
-          case display_on
-          when 'front_end'
-            active.available_to_users
-          when 'back_end'
-            active.available_to_admin
-          else
-            active.available_to_users.available_to_admin
-          end
-        available_payment_methods.select do |payment|
-          store.nil? || store.payment_methods.empty? || store.payment_methods.include?(payment)
-        end
-      end
-
       def model_name
         ModelName.new(self, Spree)
       end
-
-      # @deprecated Use .active.any? instead
-      def active?
-        Spree::Deprecation.warn "#{self}.active? is deprecated. Use #{self}.active.any? instead"
-        where(type: to_s, active: true).count > 0
-      end
-
-      # @deprecated Use .with_discarded.find instead
-      def find_with_destroyed(*args)
-        Spree::Deprecation.warn "#{self}.find_with_destroyed is deprecated. Use #{self}.with_discarded.find instead"
-        unscoped { find(*args) }
-      end
     end
 
     # Represents the gateway of this payment method
@@ -138,8 +83,6 @@ module Spree
 
       @gateway ||= gateway_class.new(gateway_options)
     end
-    alias_method :provider, :gateway
-    deprecate provider: :gateway, deprecator: Spree::Deprecation
 
     # Represents all preferences as a Hash
     #
@@ -159,29 +102,6 @@ module Spree
       raise ::NotImplementedError, "You must implement payment_source_class method for #{self.class}."
     end
 
-    # @deprecated Use {Spree::PaymentMethod#available_to_users=} and {Spree::PaymentMethod#available_to_admin=} instead
-    def display_on=(value)
-      Spree::Deprecation.warn "Spree::PaymentMethod#display_on= is deprecated."\
-        "Please use #available_to_users= and #available_to_admin= instead."
-      self.available_to_users = value.blank? || value == 'front_end'
-      self.available_to_admin = value.blank? || value == 'back_end'
-    end
-
-    # @deprecated Use {Spree::PaymentMethod#available_to_users} and {Spree::PaymentMethod#available_to_admin} instead
-    def display_on
-      Spree::Deprecation.warn "Spree::PaymentMethod#display_on is deprecated."\
-        "Please use #available_to_users and #available_to_admin instead."
-      if available_to_users? && available_to_admin?
-        ''
-      elsif available_to_users?
-        'front_end'
-      elsif available_to_admin?
-        'back_end'
-      else
-        'none'
-      end
-    end
-
     # Used as partial name for your payment method
     #
     # Currently your payment method needs to provide these partials:
@@ -202,21 +122,7 @@ module Spree
     #     The view that represents your payment method on orders through the api
     #
     def partial_name
-      deprecated_method_type_override || type.demodulize.underscore
-    end
-
-    # :nodoc:
-    # If method_type has been overridden, call it and return the value, otherwise return nil
-    def deprecated_method_type_override
-      if method(:method_type).owner != Spree::PaymentMethod
-        Spree::Deprecation.warn "#{method(:method_type).owner} is overriding PaymentMethod#method_type. This is deprecated and will be removed from Solidus 3.0 (override partial_name instead).", caller[1..-1]
-        method_type
-      end
-    end
-
-    def method_type
-      Spree::Deprecation.warn "method_type is deprecated and will be removed from Solidus 3.0 (use partial_name instead)", caller
-      partial_name
+      type.demodulize.underscore
     end
 
     def payment_profiles_supported?
@@ -274,14 +180,7 @@ module Spree
     # Represents the gateway class of this payment method
     #
     def gateway_class
-      if respond_to? :provider_class
-        Spree::Deprecation.warn \
-          "provider_class is deprecated and will be removed from Solidus 3.0 " \
-          "(use gateway_class instead)"
-        public_send :provider_class
-      else
-        raise ::NotImplementedError, "You must implement gateway_class method for #{self.class}."
-      end
+      raise ::NotImplementedError, "You must implement gateway_class method for #{self.class}."
     end
   end
 end

data/app/models/spree/payment_method/credit_card.rb

@@ -14,7 +14,7 @@ module Spree
     end
 
     def partial_name
-      deprecated_method_type_override || 'gateway'
+      'gateway'
     end
 
     def supports?(source)
@@ -27,8 +27,6 @@ module Spree
       source_ids = order.payments.where(payment_method_id: id).pluck(:source_id).uniq
       payment_source_class.where(id: source_ids).select(&:reusable?)
     end
-    alias_method :sources_by_order, :reusable_sources_by_order
-    deprecate sources_by_order: :reusable_sources_by_order, deprecator: Spree::Deprecation
 
     def reusable_sources(order)
       if order.completed?

data/app/models/spree/payment_source.rb

@@ -23,9 +23,9 @@ module Spree
     end
 
     # @param payment [Spree::Payment] the payment we want to know if can be voided
-    # @return [Boolean] true when the payment is not failed or voided
+    # @return [Boolean] true when the payment is not failed, voided or invalid
     def can_void?(payment)
-      !payment.failed? && !payment.void?
+      payment.can_void?
     end
 
     # Indicates whether its possible to credit the payment.  Note that most

data/app/models/spree/product.rb

@@ -5,10 +5,6 @@ module Spree
   # variations, called variants. Product properties include description,
   # permalink, availability, shipping category, etc. that do not change by
   # variant.
-  #
-  # @note this model uses {https://github.com/radar/paranoia paranoia}.
-  #   +#destroy+ will only soft-destroy records and the default scope hides
-  #   soft-destroyed records using +WHERE deleted_at IS NULL+.
   class Product < Spree::Base
     extend FriendlyId
     friendly_id :slug_candidates, use: :history
@@ -89,7 +85,6 @@ module Spree
              :has_default_price?,
              :images,
              :price_for,
-             :price_in,
              :rebuild_vat_prices=,
              to: :find_or_build_master
 
@@ -186,19 +181,6 @@ module Spree
       !!discontinue_on&.past?
     end
 
-    # Groups variants by the specified option type.
-    #
-    # @deprecated This method is not called in the Solidus codebase
-    # @param opt_type [String] the name of the option type to group by
-    # @param pricing_options [Spree::Config.pricing_options_class] the pricing options to search
-    #   for, default: the default pricing options
-    # @return [Hash] option_type as keys, array of variants as values.
-    def categorise_variants_from_option(opt_type, pricing_options = Spree::Config.default_pricing_options)
-      return {} unless option_types.include?(opt_type)
-      variants.with_prices(pricing_options).group_by { |variant| variant.option_values.detect { |option| option.option_type == opt_type } }
-    end
-    deprecate :categorise_variants_from_option, deprecator: Spree::Deprecation
-
     # Poor man's full text search.
     #
     # Filters products to those which have any of the strings in +values+ in
@@ -214,17 +196,6 @@ module Spree
       where conditions.inject(:or)
     end
 
-    # @param current_currency [String] currency to filter variants by; defaults to Spree's default
-    # @deprecated This method can only handle prices for currencies
-    # @return [Array<Spree::Variant>] all variants with at least one option value
-    def variants_and_option_values(current_currency = nil)
-      variants.includes(:option_values).active(current_currency).select do |variant|
-        variant.option_values.any?
-      end
-    end
-    deprecate variants_and_option_values: :variants_and_option_values_for,
-              deprecator: Spree::Deprecation
-
     # @param pricing_options [Spree::Variant::PricingOptions] the pricing options to search
     #   for, default: the default pricing options
     # @return [Array<Spree::Variant>] all variants with at least one option value
@@ -296,16 +267,6 @@ module Spree
       end
     end
 
-    # Image that can be used for the product.
-    #
-    # Will first search for images on the product, then those belonging to the
-    # variants. If all else fails, will return a new image object.
-    # @return [Spree::Image] the image to display
-    def display_image
-      Spree::Deprecation.warn('Spree::Product#display_image is DEPRECATED. Choose an image from Spree::Product#gallery instead.')
-      images.first || variant_images.first || Spree::Image.new
-    end
-
     # Finds the variant property rule that matches the provided option value ids.
     #
     # @param option_value_ids [Array<Integer>] list of option value ids
@@ -366,8 +327,14 @@ module Spree
     # If the master is invalid, the Product object will be assigned its errors
     def validate_master
       unless master.valid?
-        master.errors.each do |att, error|
-          errors.add(att, error)
+        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
+          master.errors.each do |error|
+            errors.add(error.attribute, error.message)
+          end
+        else
+          master.errors.each do |att, error|
+            errors.add(att, error)
+          end
         end
       end
     end