solidus_core 2.11.10 → 3.3.1

data/app/models/spree/address.rb

@@ -14,45 +14,24 @@ module Spree
     belongs_to :country, class_name: "Spree::Country", optional: true
     belongs_to :state, class_name: "Spree::State", optional: true
 
-    validates :address1, :city, :country_id, presence: true
+    validates :address1, :city, :country_id, :name, presence: true
     validates :zipcode, presence: true, if: :require_zipcode?
     validates :phone, presence: true, if: :require_phone?
 
-    validate :validate_name
-
     validate do
-      if Spree::Config.use_legacy_address_state_validator
-        begin
-          @silence_state_deprecations = true
-          state_validate
-          validate_state_matches_country
-        ensure
-          @silence_state_deprecations = false
-        end
-      else
-        self.class.state_validator_class.new(self).perform
-      end
+      self.class.state_validator_class.new(self).perform
     end
 
-    alias_attribute :first_name, :firstname
-    alias_attribute :last_name, :lastname
-    alias_attribute :full_name, :name
-
-    DB_ONLY_ATTRS = %w(id updated_at created_at)
-    TAXATION_ATTRS = %w(state_id country_id zipcode)
-    LEGACY_NAME_ATTRS = %w(firstname lastname full_name)
+    self.ignored_columns = %w(firstname lastname)
+    DB_ONLY_ATTRS = %w(id updated_at created_at).freeze
+    TAXATION_ATTRS = %w(state_id country_id zipcode).freeze
 
-    self.whitelisted_ransackable_attributes = %w[firstname lastname]
+    self.allowed_ransackable_attributes = %w[name]
 
     scope :with_values, ->(attributes) do
       where(value_attributes(attributes))
     end
 
-    Spree::Deprecation.deprecate_methods(
-      Spree::Address,
-      LEGACY_NAME_ATTRS.product([:name]).to_h
-    )
-
     # @return [Address] an address with default attributes
     def self.build_default(*args, &block)
       where(country: Spree::Country.default).build(*args, &block)
@@ -84,23 +63,7 @@ module Spree
     # @return [Hash] hash of attributes contributing to value equality with optional merge
     def self.value_attributes(base_attributes, merge_attributes = {})
       base = base_attributes.stringify_keys.merge(merge_attributes.stringify_keys)
-
-      name_from_attributes = Spree::Address::Name.from_attributes(base)
-      if base['firstname'].presence || base['first_name'].presence
-        base['firstname'] = name_from_attributes.first_name
-      end
-      if base['lastname'].presence || base['last_name'].presence
-        base['lastname'] = name_from_attributes.last_name
-      end
-
-      virtual_name = name_from_attributes.value
-      if base['name'].blank? && virtual_name.present?
-        base['name'] = virtual_name
-      end
-
-      excluded_attributes = DB_ONLY_ATTRS + %w(first_name last_name)
-
-      base.except(*excluded_attributes)
+      base.except(*DB_ONLY_ATTRS)
     end
 
     # @return [Hash] hash of attributes contributing to value equality
@@ -126,36 +89,7 @@ module Spree
     # @return [Boolean] true if the two addresses have the same address fields
     def ==(other_address)
       return false unless other_address && other_address.respond_to?(:value_attributes)
-      if Spree::Config.use_combined_first_and_last_name_in_address
-        value_attributes.except(*LEGACY_NAME_ATTRS) == other_address.value_attributes.except(*LEGACY_NAME_ATTRS)
-      else
-        value_attributes == other_address.value_attributes
-      end
-    end
-
-    # @deprecated Do not use this. Use Address.== instead.
-    def same_as?(other_address)
-      Spree::Deprecation.warn("Address#same_as? is deprecated. It's equivalent to Address.==", caller)
-      self == other_address
-    end
-
-    # @deprecated Do not use this. Use Address.== instead.
-    def same_as(other_address)
-      Spree::Deprecation.warn("Address#same_as is deprecated. It's equivalent to Address.==", caller)
-      self == other_address
-    end
-
-    # @deprecated Do not use this
-    def empty?
-      Spree::Deprecation.warn("Address#empty? is deprecated.", caller)
-      attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, value| value.nil? }
-    end
-
-    # This exists because the default Object#blank?, checks empty? if it is
-    # defined, and we have defined empty.
-    # This should be removed once empty? is removed
-    def blank?
-      false
+      value_attributes == other_address.value_attributes
     end
 
     # @return [Hash] an ActiveMerchant compatible address hash
@@ -202,117 +136,5 @@ module Spree
     def country_iso
       country && country.iso
     end
-
-    before_save :set_name_from_firstname_and_lastname
-
-    def set_name_from_firstname_and_lastname
-      name_from_firstname_and_lastname = Spree::Address::Name.from_attributes(attributes.except(:name, 'name'))
-
-      if read_attribute(:name).blank? && name_from_firstname_and_lastname.present?
-        write_attribute(:name, name_from_firstname_and_lastname)
-      end
-    end
-
-    # @return [String] the full name on this address
-    def name
-      self[:name] || begin
-        Spree::Address::Name.new(
-          read_attribute(:firstname),
-          read_attribute(:lastname)
-        ).value
-      end
-    end
-
-    def name=(value)
-      return if value.nil?
-
-      write_attribute(:name, value)
-      name_from_value = Spree::Address::Name.new(value)
-      write_attribute(:firstname, name_from_value.first_name)
-      write_attribute(:lastname, name_from_value.last_name)
-    end
-
-    def as_json(options = {})
-      if Spree::Config.use_combined_first_and_last_name_in_address
-        super(options.merge(except: LEGACY_NAME_ATTRS)).tap do |hash|
-          hash['name'] = name
-        end
-      else
-        super
-      end
-    end
-
-    private
-
-    def validate_name
-      return if name.present?
-
-      name_attribute = if Spree::Config.use_combined_first_and_last_name_in_address
-        :name
-      else
-        :firstname
-      end
-      errors.add(name_attribute, :blank)
-    end
-
-    def state_validate
-      unless @silence_state_deprecations
-        Spree::Deprecation.warn \
-          "#{self.class}#state_validate private method has been deprecated" \
-          " and will be removed in Solidus v3." \
-          " Check https://github.com/solidusio/solidus/pull/3129 for more details.",
-          caller
-      end
-
-      # Skip state validation without country (also required)
-      # or when disabled by preference
-      return if country.blank? || !Spree::Config[:address_requires_state]
-      return unless country.states_required
-
-      # ensure associated state belongs to country
-      if state.present?
-        if state.country == country
-          self.state_name = nil # not required as we have a valid state and country combo
-        elsif state_name.present?
-          self.state = nil
-        else
-          errors.add(:state, :invalid)
-        end
-      end
-
-      # ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
-      if state_name.present?
-        if country.states.present?
-          states = country.states.with_name_or_abbr(state_name)
-
-          if states.size == 1
-            self.state = states.first
-            self.state_name = nil
-          else
-            errors.add(:state, :invalid)
-          end
-        end
-      end
-
-      # ensure at least one state field is populated
-      errors.add :state, :blank if state.blank? && state_name.blank?
-    end
-
-    def validate_state_matches_country
-      unless @silence_state_deprecations
-        Spree::Deprecation.warn \
-          "#{self.class}#validate_state_matches_country private method has been deprecated" \
-          " and will be removed in Solidus v3." \
-          " Check https://github.com/solidusio/solidus/pull/3129 for more details.",
-          caller
-      end
-
-      return unless country
-
-      self.state = nil if country.states.empty?
-      if state && state.country != country
-        errors.add(:state, :does_not_match_country)
-      end
-    end
   end
 end

data/app/models/spree/adjustment.rb

@@ -28,11 +28,6 @@ module Spree
     validates :amount, numericality: true
     validates :promotion_code, presence: true, if: :require_promotion_code?
 
-    # We need to use `after_commit` here because otherwise it's too early to
-    # tell if any repair is needed.
-    after_commit :repair_adjustments_associations_on_create, on: [:create]
-    after_commit :repair_adjustments_associations_on_destroy, on: [:destroy]
-
     scope :not_finalized, -> { where(finalized: false) }
     scope :finalized, -> { where(finalized: true) }
     scope :cancellation, -> { where(source_type: 'Spree::UnitCancel') }
@@ -60,12 +55,14 @@ module Spree
     #
     # @param excluded_orders [Array<Spree::Order>] Orders to exclude from query
     # @return [ActiveRecord::Relation] Scoped Adjustments
-    def self.in_completed_orders(excluded_orders: [])
-      joins(:order).
-      merge(Spree::Order.complete).
-      where.not(spree_orders: { id: excluded_orders }).
-      distinct
+    def self.in_completed_orders(excluded_orders: [], exclude_canceled: false)
+      result = joins(:order)
+               .merge(Spree::Order.complete)
+               .where.not(spree_orders: { id: excluded_orders })
+               .distinct
+      exclude_canceled ? result.merge(Spree::Order.not_canceled) : result
     end
+    deprecate :in_completed_orders, "Please don't use this and rather go through Spree::Promotion#discounted_orders"
 
     def finalize!
       update!(finalized: true)
@@ -135,15 +132,6 @@ module Spree
       amount
     end
 
-    def update!(*args)
-      if args.empty?
-        Spree::Deprecation.warn "Calling adjustment.update! with no arguments to recalculate amounts and eligibility is deprecated, since it conflicts with AR::Base#update! Please use adjustment.recalculate instead"
-        recalculate
-      else
-        super
-      end
-    end
-
     # Calculates based on attached promotion (if this is a promotion
     # adjustment) whether this promotion is still eligible.
     # @api private
@@ -161,19 +149,5 @@ module Spree
     def require_promotion_code?
       promotion? && !source.promotion.apply_automatically && source.promotion.codes.any?
     end
-
-    def repair_adjustments_associations_on_create
-      if adjustable.adjustments.loaded? && !adjustable.adjustments.include?(self) && !destroyed?
-        Spree::Deprecation.warn("Adjustment #{id} was not added to #{adjustable.class} #{adjustable.id}. Add adjustments via `adjustable.adjustments.create!`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
-        adjustable.adjustments.proxy_association.add_to_target(self)
-      end
-    end
-
-    def repair_adjustments_associations_on_destroy
-      if adjustable.adjustments.loaded? && adjustable.adjustments.include?(self)
-        Spree::Deprecation.warn("Adjustment #{id} was not removed from #{adjustable.class} #{adjustable.id}. Remove adjustments via `adjustable.adjustments.destroy`. Partial call stack: #{caller.select { |line| line =~ %r(/(app|spec)/) }}.", caller)
-        adjustable.adjustments.proxy_association.target.delete(self)
-      end
-    end
   end
 end

data/app/models/spree/base.rb

@@ -1,62 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 class Spree::Base < ActiveRecord::Base
   include Spree::Core::Permalinks
   include Spree::RansackableAttributes
 
-  def self.preference(*args)
-    Spree::Deprecation.warn <<~WARN
-      #{name} has a `preferences` column, but does not explicitly (de)serialize this column.
-      In order to make #{name} work with future versions of Solidus (and Rails), please add the
-      following line to your class:
-      ```
-      class #{name}
-        include Spree::Preferences::Persistable
-        ...
-      end
-      ```
-    WARN
-    include Spree::Preferences::Persistable
-    preference(*args)
-  end
-
-  def preferences
-    value = read_attribute(:preferences)
-    if !value.is_a?(Hash)
-      Spree::Deprecation.warn <<~WARN
-        #{self.class.name} has a `preferences` column, but does not explicitly (de)serialize this column.
-        In order to make #{self.class.name} work with future versions of Solidus (and Rails), please add the
-        following lines to your class:
-        ```
-        class #{self.class.name}
-          include Spree::Preferences::Persistable
-          ...
-        end
-        ```
-      WARN
-      self.class.include Spree::Preferences::Persistable
-
-      ActiveRecord::Type::Serialized.new(
-        ActiveRecord::Type::Text.new,
-        ActiveRecord::Coders::YAMLColumn.new(:preferences, Hash)
-      ).deserialize(value)
-    else
-      value
-    end
-  end
-
-  if Kaminari.config.page_method_name != :page
-    def self.page(num)
-      Spree::Deprecation.warn \
-        "Redefining Spree::Base.page for a different kaminari page name is better done inside " \
-        "your own app. This will be removed from future versions of solidus."
-
-      send Kaminari.config.page_method_name, num
-    end
-  end
-
   self.abstract_class = true
 
   # Provides a scope that should be included any time products

data/app/models/spree/calculator/flat_fee.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency 'spree/calculator'
+
+module Spree
+  # Very simple tax rate calculator. Can be used to apply a flat fee to any
+  # type of item, including an order.
+  class Calculator::FlatFee < Calculator
+    alias_method :rate, :calculable
+
+    # Amount is fixed regardles of what it's being applied to.
+    def compute(_object)
+      rate.active? ? rate.amount : 0
+    end
+
+    alias_method :compute_order, :compute
+    alias_method :compute_shipment, :compute
+    alias_method :compute_line_item, :compute
+    alias_method :compute_shipping_rate, :compute
+  end
+end

data/app/models/spree/calculator/flexi_rate.rb

@@ -9,11 +9,6 @@ module Spree
     preference :max_items,       :integer, default: 0
     preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
 
-    def self.available?(_object)
-      Spree::Deprecation.warn('Spree::Calculator::FlexiRate::available is DEPRECATED. Use the instance method instead.')
-      true
-    end
-
     def compute(object)
       items_count = object.quantity
       items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?

data/app/models/spree/calculator.rb

@@ -31,13 +31,6 @@ module Spree
 
     ###################################################################
 
-    # Returns all calculators applicable for kind of work
-    def self.calculators
-      Spree::Deprecation.warn("Calling .calculators is deprecated. Please access through Rails.application.config.spree.calculators")
-
-      Spree::Config.environment.calculators
-    end
-
     def to_s
       self.class.name.titleize.gsub("Calculator\/", "")
     end

data/app/models/spree/carton.rb

@@ -42,7 +42,7 @@ class Spree::Carton < Spree::Base
   end
 
   def display_shipped_at
-    shipped_at.to_s(:rfc822)
+    Spree::RailsCompatibility.to_fs(shipped_at, :rfc822)
   end
 
   def manifest

data/app/models/spree/country.rb

@@ -8,15 +8,10 @@ module Spree
 
     validates :name, :iso_name, presence: true
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     def self.default
-      if Spree::Config.default_country_id
-        Spree::Deprecation.warn("Setting your default country via its ID is deprecated. Please set your default country via the `default_country_iso` setting.", caller)
-        find_by(id: Spree::Config.default_country_id) || find_by!(iso: Spree::Config.default_country_iso)
-      else
-        find_by!(iso: Spree::Config.default_country_iso)
-      end
+      find_by!(iso: Spree::Config.default_country_iso)
     end
 
     def self.available(restrict_to_zone: Spree::Config[:checkout_zone])

data/app/models/spree/credit_card.rb

@@ -21,11 +21,6 @@ module Spree
 
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
 
-    def self.default
-      Spree::Deprecation.warn("CreditCard.default is deprecated. Please use Spree::Wallet instead.")
-      joins(:wallet_payment_sources).where(spree_wallet_payment_sources: { default: true })
-    end
-
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type
 
@@ -46,28 +41,6 @@ module Spree
       'laser'              => /^(6304|6706|6709|6771(?!89))\d{8}(\d{4}|\d{6,7})?$/
     }.freeze
 
-    def default
-      Spree::Deprecation.warn("CreditCard#default is deprecated. Please use user.wallet.default_wallet_payment_source instead.", caller)
-      return false if user.nil?
-      user.wallet.default_wallet_payment_source.try!(:payment_source) == self
-    end
-
-    def default=(set_as_default)
-      Spree::Deprecation.warn("CreditCard#default= is deprecated. Please use user.wallet.default_wallet_payment_source= instead.", caller)
-      if user.nil?
-        raise "Cannot set 'default' on a credit card without a user"
-      elsif set_as_default # setting this card as default
-        wallet_payment_source = user.wallet.add(self)
-        user.wallet.default_wallet_payment_source = wallet_payment_source
-        true
-      else # removing this card as default
-        if user.wallet.default_wallet_payment_source.try!(:payment_source) == self
-          user.wallet.default_wallet_payment_source = nil
-        end
-        false
-      end
-    end
-
     def address_attributes=(attributes)
       self.address = Spree::Address.immutable_merge(address, attributes)
     end
@@ -124,7 +97,7 @@ module Spree
 
     # Sets the last digits field based on the assigned credit card number.
     def set_last_digits
-      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
+      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..)
     end
 
     # @return [String] the credit card type if it can be determined from the

data/app/models/spree/customer_return.rb

@@ -17,11 +17,10 @@ module Spree
 
     accepts_nested_attributes_for :return_items
 
-    self.whitelisted_ransackable_attributes = ['number']
+    self.allowed_ransackable_attributes = ['number']
 
     extend DisplayMoney
-    money_methods :pre_tax_total, :total, :total_excluding_vat, :amount
-    deprecate display_pre_tax_total: :display_total_excluding_vat, deprecator: Spree::Deprecation
+    money_methods :total, :total_excluding_vat, :amount
 
     delegate :currency, to: :order
     delegate :id, to: :order, prefix: true, allow_nil: true
@@ -33,8 +32,6 @@ module Spree
     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)
@@ -43,7 +40,8 @@ module Spree
     # Temporarily tie a customer_return to one order
     def order
       return nil if return_items.blank?
-      return_items.first.inventory_unit.order
+
+      return_items.first.inventory_unit&.order
     end
 
     def fully_reimbursed?
@@ -68,7 +66,7 @@ module Spree
     end
 
     def return_items_belong_to_same_order
-      if return_items.reject{ |return_item| return_item.inventory_unit.order_id == order_id }.any?
+      if return_items.reject{ |return_item| return_item.inventory_unit&.order_id == order_id }.any?
         errors.add(:base, I18n.t('spree.return_items_cannot_be_associated_with_multiple_orders'))
       end
     end

data/app/models/spree/image/active_storage_attachment.rb

@@ -12,13 +12,8 @@ module Spree::Image::ActiveStorageAttachment
     validate :supported_content_type
 
     has_attachment :attachment,
-                   styles: {
-                   mini: '48x48>',
-                   small: '400x400>',
-                   product: '680x680>',
-                   large: '1200x1200>'
-                 },
-                 default_style: :product
+                   styles: Spree::Config.product_image_styles,
+                   default_style: Spree::Config.product_image_style_default
 
     def supported_content_type
       unless attachment.content_type.in?(Spree::Config.allowed_image_mime_types)

data/app/models/spree/image/paperclip_attachment.rb

@@ -7,8 +7,8 @@ module Spree::Image::PaperclipAttachment
     validate :no_attachment_errors
 
     has_attached_file :attachment,
-                      styles: { mini: '48x48>', small: '400x400>', product: '680x680>', large: '1200x1200>' },
-                      default_style: :product,
+                      styles: Spree::Config.product_image_styles,
+                      default_style: Spree::Config.product_image_style_default,
                       default_url: 'noimage/:style.png',
                       url: '/spree/products/:id/:style/:basename.:extension',
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',

data/app/models/spree/image.rb

@@ -3,12 +3,5 @@
 module Spree
   class Image < Asset
     include ::Spree::Config.image_attachment_module
-
-    def mini_url
-      Spree::Deprecation.warn(
-        'Spree::Image#mini_url is DEPRECATED. Use Spree::Image#url(:mini) instead.'
-      )
-      url(:mini)
-    end
   end
 end

data/app/models/spree/inventory_unit.rb

@@ -60,27 +60,6 @@ module Spree
 
     include ::Spree::Config.state_machines.inventory_unit
 
-    # Updates the given inventory units to not be pending.
-    #
-    # @deprecated do not use this, use
-    #   Spree::Stock::InventoryUnitsFinalizer.new(inventory_units).run!
-    # @param inventory_units [<Spree::InventoryUnit>] the inventory to be
-    #   finalized
-    def self.finalize_units!(inventory_units)
-      Spree::Deprecation.warn(
-        "inventory_units.finalize_units!(inventory_units) is deprecated. Please
-        use Spree::Stock::InventoryUnitsFinalizer.new(inventory_units).run!",
-        caller
-      )
-
-      inventory_units.map do |iu|
-        iu.update_columns(
-          pending: false,
-          updated_at: Time.current
-        )
-      end
-    end
-
     # @return [Spree::StockItem] the first stock item from this shipment's
     #   stock location that is associated with this inventory unit's variant
     def find_stock_item