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 1/3] 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

From 4043e19910939ce83dd09737c5ad17c718fecb3f Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:10:07 +0100
Subject: [PATCH 2/3] Add deleted_at to spree_return_authorizations

---
 ...20210407170804_add_deleted_at_to_return_authorizations.rb | 5 +++++
 db/schema.rb                                                 | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20210407170804_add_deleted_at_to_return_authorizations.rb

diff --git a/db/migrate/20210407170804_add_deleted_at_to_return_authorizations.rb b/db/migrate/20210407170804_add_deleted_at_to_return_authorizations.rb
new file mode 100644
index 0000000000..72b4f872b5
--- /dev/null
+++ b/db/migrate/20210407170804_add_deleted_at_to_return_authorizations.rb
@@ -0,0 +1,5 @@
+class AddDeletedAtToReturnAuthorizations < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spree_return_authorizations, :deleted_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 454f7688d3..92c4a23937 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210329123820) do
+ActiveRecord::Schema.define(version: 20210407170804) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -754,6 +754,7 @@ ActiveRecord::Schema.define(version: 20210329123820) do
     t.datetime "created_at",                                                             null: false
     t.datetime "updated_at",                                                             null: false
     t.integer  "stock_location_id"
+    t.datetime "deleted_at"
   end
 
   create_table "spree_roles", force: :cascade do |t|

From d385c1ad4d5a214ec6a60430e3b398d9b26af565 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:11:06 +0100
Subject: [PATCH 3/3] Soft-delete return authorizations

---
 app/models/spree/return_authorization.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/spree/return_authorization.rb b/app/models/spree/return_authorization.rb
index f05afee8c4..37394e69d6 100644
--- a/app/models/spree/return_authorization.rb
+++ b/app/models/spree/return_authorization.rb
@@ -2,6 +2,8 @@
 
 module Spree
   class ReturnAuthorization < ActiveRecord::Base
+    acts_as_paranoid
+
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 
     has_many :inventory_units, inverse_of: :return_authorization