From 0a9d63dd2f27ca51e57b14a7ca305b5346ff8038 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sat, 21 Dec 2019 13:50:47 +0100 Subject: [PATCH] Fix deprecated syntax on associations --- app/models/spree/adjustment_decorator.rb | 5 +++-- app/models/spree/order_decorator.rb | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/spree/adjustment_decorator.rb b/app/models/spree/adjustment_decorator.rb index 2e1dfcebf7..a12d68e7fa 100644 --- a/app/models/spree/adjustment_decorator.rb +++ b/app/models/spree/adjustment_decorator.rb @@ -9,8 +9,9 @@ module Spree # So we don't need the option `dependent: :destroy` as long as # AdjustmentMetadata has no destroy logic itself. has_one :metadata, class_name: 'AdjustmentMetadata' - belongs_to :tax_rate, foreign_key: 'originator_id', - conditions: "spree_adjustments.originator_type = 'Spree::TaxRate'" + belongs_to :tax_rate, -> { where spree_adjustments: { originator_type: 'Spree::TaxRate' } }, + foreign_key: 'originator_id' + scope :enterprise_fee, -> { where(originator_type: 'EnterpriseFee') } scope :admin, -> { where(source_type: nil, originator_type: nil) } diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 4e1e2e67e5..3c2dbafa0a 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -21,10 +21,9 @@ Spree::Order.class_eval do # This removes "inverse_of: source" which breaks shipment adjustment calculations # This change is done in Spree 2.1 (see https://github.com/spree/spree/commit/3fa44165c7825f79a2fa4eb79b99dc29944c5d55) # When OFN gets to Spree 2.1, this can be removed - has_many :adjustments, + has_many :adjustments, -> { order "#{Spree::Adjustment.table_name}.created_at ASC" }, as: :adjustable, - dependent: :destroy, - order: "#{Spree::Adjustment.table_name}.created_at ASC" + dependent: :destroy validates :customer, presence: true, if: :require_customer? validate :products_available_from_new_distribution, if: lambda { distributor_id_changed? || order_cycle_id_changed? }