Merge pull request #6679 from Matt-Yorkley/soft-delete-enterprise-fees

Soft-delete Enterprise Fees

app/models/enterprise_fee.rb

@@ -1,6 +1,8 @@
 class EnterpriseFee < ActiveRecord::Base
   include Spree::Core::CalculatedAdjustments
 
+  acts_as_paranoid
+
   belongs_to :enterprise
   belongs_to :tax_category, class_name: 'Spree::TaxCategory', foreign_key: 'tax_category_id'
 

app/models/spree/adjustment.rb

@@ -162,6 +162,13 @@ module Spree
       result
     end
 
+    # Allow accessing soft-deleted originator objects
+    def originator
+      return if originator_type.blank?
+
+      originator_type.constantize.unscoped { super }
+    end
+
     private
 
     def update_adjustable