From 2ed1aaf5753c97dec50325a6bdd0f296ebc64a6c Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:58:46 +0100 Subject: [PATCH] Update unscoping of deleted_at on originator association --- app/models/spree/adjustment.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/models/spree/adjustment.rb b/app/models/spree/adjustment.rb index 5023639369..0f1662d029 100644 --- a/app/models/spree/adjustment.rb +++ b/app/models/spree/adjustment.rb @@ -38,7 +38,7 @@ module Spree belongs_to :adjustable, polymorphic: true belongs_to :source, polymorphic: true - belongs_to :originator, polymorphic: true + belongs_to :originator, -> { with_deleted }, polymorphic: true belongs_to :order, class_name: "Spree::Order" belongs_to :tax_rate, -> { where spree_adjustments: { originator_type: 'Spree::TaxRate' } }, @@ -142,13 +142,6 @@ module Spree included_tax.positive? end - # Allow accessing soft-deleted originator objects - def originator - return if originator_type.blank? - - originator_type.constantize.unscoped { super } - end - private def update_adjustable_adjustment_total