solidus_core 2.10.5 → 3.0.8

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,10 +5,11 @@ class Spree::PromotionCode < Spree::Base
   belongs_to :promotion_code_batch, class_name: "Spree::PromotionCodeBatch", optional: true
   has_many :adjustments
 
-  validates :value, presence: true, uniqueness: { allow_blank: true }
-  validates :promotion, presence: true
+  before_validation :normalize_code
 
-  before_save :normalize_code
+  validates :value, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
+  validates :promotion, presence: true
+  validate :promotion_not_apply_automatically, on: :create
 
   self.whitelisted_ransackable_attributes = ['value']
 
@@ -37,6 +38,10 @@ class Spree::PromotionCode < Spree::Base
     promotion.per_code_usage_limit
   end
 
+  def promotion_not_apply_automatically
+    errors.add(:base, :disallowed_with_apply_automatically) if promotion.apply_automatically
+  end
+
   private
 
   def normalize_code

data/app/models/spree/promotion_code_batch.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class PromotionCodeBatch < ActiveRecord::Base
+  class PromotionCodeBatch < Spree::Base
     class CantProcessStartedBatch < StandardError
     end
 

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

@@ -13,9 +13,9 @@ module Spree
 
       def apply
         if coupon_code.present?
-          if promotion.present? && promotion.actions.exists?
+          if promotion.present? && promotion.active? && promotion.actions.exists?
             handle_present_promotion(promotion)
-          elsif promotion_code && promotion_code.promotion.inactive?
+          elsif promotion_code&.promotion&.expired?
             set_error_code :coupon_code_expired
           else
             set_error_code :coupon_code_not_found

data/app/models/spree/promotion_rule.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require 'spree/preferences/persistable'
+
 module Spree
   # Base class for all promotion rules
   class PromotionRule < Spree::Base
+    include Spree::Preferences::Persistable
+
     belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules, optional: true
 
     scope :of_type, ->(type) { where(type: type) }
@@ -45,7 +49,7 @@ module Spree
     end
 
     def eligibility_error_message(key, options = {})
-      I18n.t(key, { scope: [:spree, :eligibility_errors, :messages] }.merge(options))
+      I18n.t(key, **{ scope: [:spree, :eligibility_errors, :messages] }.merge(options))
     end
   end
 end

data/app/models/spree/promotion_rule_role.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class PromotionRuleRole < ActiveRecord::Base
+  class PromotionRuleRole < Spree::Base
     belongs_to :promotion_rule, class_name: 'Spree::PromotionRule', optional: true
     belongs_to :role, class_name: 'Spree::Role', optional: true
   end

data/app/models/spree/refund.rb

@@ -10,13 +10,11 @@ module Spree
 
     validates :payment, presence: true
     validates :reason, presence: true
-    validates :transaction_id, presence: true, on: :update # can't require this on create because the before_create needs to run first
     validates :amount, presence: true, numericality: { greater_than: 0 }
 
     validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create
 
-    after_create :perform!
-    after_create :create_log_entry
+    attr_reader :perform_response
 
     scope :non_reimbursement, -> { where(reimbursement_id: nil) }
 
@@ -33,26 +31,38 @@ 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
 
-    private
-
-    # attempts to perform the refund.
+    # Must be called for the refund transaction to be processed.
+    #
+    # Attempts to perform the refund,
     # raises an error if the refund fails.
     def perform!
       return true if transaction_id.present?
 
       credit_cents = money.cents
 
-      @response = process!(credit_cents)
+      @perform_response = process!(credit_cents)
+      log_entries.build(details: perform_response.to_yaml)
+
+      self.transaction_id = perform_response.authorization
+      save!
 
-      self.transaction_id = @response.authorization
-      update_columns(transaction_id: transaction_id)
       update_order
     end
 
+    private
+
     # return an activemerchant response object if successful or else raise an error
     def process!(credit_cents)
       response = if payment.payment_method.payment_profiles_supported?
@@ -73,10 +83,6 @@ module Spree
       raise Core::GatewayError.new(I18n.t('spree.unable_to_connect_to_gateway'))
     end
 
-    def create_log_entry
-      log_entries.create!(details: @response.to_yaml)
-    end
-
     def amount_is_less_than_or_equal_to_allowed_amount
       if payment && amount > payment.credit_allowed
         errors.add(:amount, :greater_than_allowed)

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)
@@ -104,11 +93,9 @@ module Spree
       if unpaid_amount_within_tolerance?
         reimbursed!
         Spree::Event.fire 'reimbursement_reimbursed', reimbursement: self
-        reimbursement_success_hooks.each { |hook| hook.call self }
       else
         errored!
         Spree::Event.fire 'reimbursement_errored', reimbursement: self
-        reimbursement_failure_hooks.each { |hook| hook.call self }
       end
 
       if errored?
@@ -116,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)
@@ -144,15 +128,20 @@ 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)
     end
 
+    # The returned category is used as the category
+    # for Spree::Reimbursement::Credit.default_creditable_class.
+    #
+    # @return [Spree::StoreCreditCategory]
+    def store_credit_category
+      Spree::StoreCreditCategory.find_by(name: Spree::StoreCreditCategory::REIMBURSEMENT)
+    end
+
     private
 
     def calculate_total

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

@@ -37,7 +37,13 @@ module Spree
         reason: Spree::RefundReason.return_processing_reason
       })
 
-      simulate ? refund.readonly! : refund.save!
+      if simulate
+        refund.readonly!
+      else
+        refund.save!
+        refund.perform!
+      end
+
       refund
     end
 
@@ -54,7 +60,7 @@ module Spree
       Spree::Reimbursement::Credit.default_creditable_class.new(
         user: reimbursement.order.user,
         amount: unpaid_amount,
-        category: Spree::StoreCreditCategory.reimbursement_category(reimbursement),
+        category: reimbursement.store_credit_category,
         created_by: created_by,
         memo: "Refund for uncreditable payments on order #{reimbursement.order.number}",
         currency: reimbursement.order.currency

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']
 
     def total_excluding_vat
-      return_items.map(&:total_excluding_vat).sum
+      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/exchange_variant_eligibility/same_option_value.rb

@@ -23,7 +23,7 @@ module Spree
         # blue pants with 34 waist and 32 inseam
 
         def self.eligible_variants(variant, options = {})
-          product_variants = SameProduct.eligible_variants(variant, options).includes(option_values: :option_type)
+          product_variants = SameProduct.eligible_variants(variant, **options).includes(option_values: :option_type)
           relevant_option_values = variant.option_values.select { |ov| option_type_restrictions.include? ov.option_type.name }
 
           if relevant_option_values.present?

data/app/models/spree/return_item.rb

@@ -81,8 +81,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,9 +89,6 @@ module Spree
       COMPLETED_RECEPTION_STATUSES.map(&:to_s).include?(reception_status.to_s)
     end
 
-
-    attr_accessor :skip_customer_return_processing
-
     # @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
@@ -129,8 +125,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
@@ -196,13 +190,12 @@ module Spree
 
     def process_inventory_unit!
       inventory_unit.return!
-      if customer_return
-        customer_return.stock_location.restock(inventory_unit.variant, 1, customer_return) if should_restock?
-        unless skip_customer_return_processing
-          Deprecation.warn 'From Solidus v2.9 onwards, #process_inventory_unit! will not call customer_return#process_return!'
-          customer_return.process_return!
-        end
+
+      if should_restock?
+        customer_return.stock_location.restock(inventory_unit.variant, 1, customer_return)
       end
+
+      customer_return&.process_return!
     end
 
     def sibling_intended_for_exchange(status)
@@ -261,10 +254,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
 
@@ -276,9 +268,9 @@ module Spree
     end
 
     def should_restock?
-      resellable? &&
+      customer_return &&
+        resellable? &&
         variant.should_track_inventory? &&
-        customer_return &&
         customer_return.stock_location.restock_inventory?
     end
   end

data/app/models/spree/role.rb

@@ -5,7 +5,7 @@ module Spree
     has_many :role_users, class_name: "Spree::RoleUser", dependent: :destroy
     has_many :users, through: :role_users
 
-    validates_uniqueness_of :name
+    validates_uniqueness_of :name, case_sensitive: true
 
     def admin?
       name == "admin"

data/app/models/spree/shipment.rb

@@ -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?
@@ -150,7 +130,7 @@ module Spree
     end
 
     def item_cost
-      line_items.map(&:total).sum
+      line_items.sum(&:total)
     end
 
     def ready_or_pending?
@@ -262,7 +242,7 @@ module Spree
     def to_package
       package = Stock::Package.new(stock_location)
       package.shipment = self
-      inventory_units.includes(:variant).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
+      inventory_units.includes(variant: :product).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
         package.add_multiple state_inventory_units, state.to_sym
       end
       package
@@ -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_calculator.rb

@@ -13,7 +13,7 @@ module Spree
     private
 
     def total(content_items)
-      content_items.map(&:amount).sum
+      content_items.sum(&:amount)
     end
   end
 end

data/app/models/spree/shipping_manifest.rb

@@ -16,7 +16,7 @@ class Spree::ShippingManifest
   def items
     # Grouping by the ID means that we don't have to call out to the association accessor
     # This makes the grouping by faster because it results in less SQL cache hits.
-    @inventory_units.group_by(&:variant_id).map do |_variant_id, variant_units|
+    @inventory_units.group_by(&:variant_id).flat_map do |_variant_id, variant_units|
       variant_units.group_by(&:line_item_id).map do |_line_item_id, units|
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
@@ -25,6 +25,6 @@ class Spree::ShippingManifest
 
         ManifestItem.new(first_unit.line_item, first_unit.variant, units.length, states)
       end
-    end.flatten
+    end
   end
 end

data/app/models/spree/shipping_method.rb

@@ -1,23 +1,11 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   # Represents a means of having a shipment delivered, such as FedEx or UPS.
   #
   class ShippingMethod < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
-
+    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
@@ -28,7 +16,7 @@ module Spree
     has_many :shipping_method_zones, dependent: :destroy
     has_many :zones, through: :shipping_method_zones
 
-    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :tax_category, -> { with_discarded }, class_name: 'Spree::TaxCategory', optional: true
     has_many :shipping_method_stock_locations, dependent: :destroy, class_name: "Spree::ShippingMethodStockLocation"
     has_many :stock_locations, through: :shipping_method_stock_locations
 
@@ -102,31 +90,11 @@ 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
       if shipping_categories.empty?
-        errors[:base] << "You need to select at least one shipping category"
+        errors.add(:base, "You need to select at least one shipping category")
       end
     end
   end

data/app/models/spree/shipping_rate.rb

@@ -6,7 +6,7 @@ module Spree
   #
   class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
-    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
+    belongs_to :shipping_method, -> { with_discarded }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
 
     has_many :taxes,
              class_name: "Spree::ShippingRateTax",
@@ -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

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