solidus_core 2.11.16 → 3.0.0.rc2

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') }
@@ -135,15 +130,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 +147,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,60 +1,24 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 class Spree::Base < ActiveRecord::Base
+  include Spree::Preferences::Preferable
   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
+  def initialize_preference_defaults
+    if has_attribute?(:preferences)
+      self.preferences = default_preferences.merge(preferences)
     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
+  # Only run preference initialization on models which requires it. Improves
+  # performance of record initialization slightly.
+  def self.preference(*args)
+    # after_initialize can be called multiple times with the same symbol, it
+    # will only be called once on initialization.
+    serialize :preferences, Hash
+    after_initialize :initialize_preference_defaults
+    super
   end
 
   self.abstract_class = true

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

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   class Calculator < Spree::Base
-    include Spree::Preferences::Persistable
-
     belongs_to :calculable, polymorphic: true, optional: true
 
     # This method calls a compute_<computable> method. must be overriden in concrete calculator.
@@ -31,13 +27,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/country.rb

@@ -11,12 +11,7 @@ module Spree
     self.whitelisted_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

data/app/models/spree/customer_return.rb

@@ -20,8 +20,7 @@ module Spree
     self.whitelisted_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)

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

@@ -7,10 +7,6 @@ module Spree::Image::ActiveStorageAttachment
   delegate :width, :height, to: :attachment, prefix: true
 
   included do
-    validates :attachment, presence: true
-    validate :attachment_is_an_image
-    validate :supported_content_type
-
     has_attachment :attachment,
                    styles: {
                    mini: '48x48>',
@@ -19,11 +15,7 @@ module Spree::Image::ActiveStorageAttachment
                    large: '1200x1200>'
                  },
                  default_style: :product
-
-    def supported_content_type
-      unless attachment.content_type.in?(Spree::Config.allowed_image_mime_types)
-        errors.add(:attachment, :content_type_not_supported)
-      end
-    end
+    validates :attachment, presence: true
+    validate :attachment_is_an_image
   end
 end

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

@@ -15,7 +15,7 @@ module Spree::Image::PaperclipAttachment
                       convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
     validates_attachment :attachment,
       presence: true,
-      content_type: { content_type: Spree::Config.allowed_image_mime_types }
+      content_type: { content_type: %w[image/jpeg image/jpg image/png image/gif] }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet

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

data/app/models/spree/line_item.rb

@@ -10,8 +10,6 @@ module Spree
   # promotion system.
   #
   class LineItem < Spree::Base
-    class CurrencyMismatch < StandardError; end
-
     belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items, touch: true, optional: true
     belongs_to :variant, -> { with_discarded }, class_name: "Spree::Variant", inverse_of: :line_items, optional: true
     belongs_to :tax_category, class_name: "Spree::TaxCategory", optional: true
@@ -55,20 +53,11 @@ module Spree
     end
     alias subtotal amount
 
-    # @return [BigDecimal] the amount of this line item, taking into
-    #   consideration line item promotions.
-    def discounted_amount
-      amount + promo_total
-    end
-    deprecate discounted_amount: :total_before_tax, deprecator: Spree::Deprecation
-
     # @return [BigDecimal] the amount of this line item, taking into
     #   consideration all its adjustments.
     def total
       amount + adjustment_total
     end
-    alias final_amount total
-    deprecate final_amount: :total, deprecator: Spree::Deprecation
 
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
@@ -81,20 +70,11 @@ 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
 
     extend Spree::DisplayMoney
-    money_methods :amount, :discounted_amount, :price,
+    money_methods :amount, :price,
                   :included_tax_total, :additional_tax_total,
                   :total, :total_before_tax, :total_excluding_vat
-    deprecate display_discounted_amount: :display_total_before_tax, deprecator: Spree::Deprecation
-    alias display_final_amount display_total
-    deprecate display_final_amount: :display_total, deprecator: Spree::Deprecation
-    alias display_pre_tax_amount display_total_excluding_vat
-    deprecate display_pre_tax_amount: :display_total_excluding_vat, deprecator: Spree::Deprecation
-    alias discounted_money display_discounted_amount
-    deprecate discounted_money: :display_total_before_tax, deprecator: Spree::Deprecation
 
     # @return [Spree::Money] the price of this line item
     alias money_price display_price
@@ -103,8 +83,6 @@ module Spree
 
     # @return [Spree::Money] the amount of this line item
     alias money display_amount
-    alias display_total display_amount
-    deprecate display_total: :display_amount, deprecator: Spree::Deprecation
 
     # Sets price from a `Spree::Money` object
     #
@@ -112,9 +90,6 @@ module Spree
     def money_price=(money)
       if !money
         self.price = nil
-      elsif money.currency.iso_code != currency && Spree::Config.raise_with_invalid_currency
-        line_item_errors = ActiveModel::Errors.new(self)
-        raise CurrencyMismatch, line_item_errors.generate_message(:price, :does_not_match_order_currency, locale: :en)
       else
         self.price_currency = money.currency.iso_code
         self.price = money.to_d
@@ -156,12 +131,6 @@ module Spree
       Spree::Config.pricing_options_class.from_line_item(self)
     end
 
-    def currency=(_currency)
-      Spree::Deprecation.warn 'Spree::LineItem#currency= is deprecated ' \
-        'and will take no effect.',
-        caller
-    end
-
     private
 
     # Sets the quantity to zero if it is nil or less than zero.
@@ -177,25 +146,13 @@ module Spree
       set_pricing_attributes
     end
 
-    # Set price, cost_price and currency. This method used to be called #copy_price, but actually
-    # did more than just setting the price, hence renamed to #set_pricing_attributes
+    # Set price, cost_price and currency.
     def set_pricing_attributes
-      # If the legacy method #copy_price has been overridden, handle that gracefully
-      return handle_copy_price_override if respond_to?(:copy_price)
-
       self.cost_price ||= variant.cost_price
       self.money_price = variant.price_for(pricing_options) if price.nil?
       true
     end
 
-    def handle_copy_price_override
-      copy_price
-      Spree::Deprecation.warn 'You have overridden Spree::LineItem#copy_price. ' \
-        'This method is now called Spree::LineItem#set_pricing_attributes. ' \
-        'Please adjust your override.',
-        caller
-    end
-
     def update_inventory
       if (saved_changes? || target_shipment.present?) && order.has_checkout_step?("delivery")
         Spree::OrderInventory.new(order, self).verify(target_shipment)