From 512fc625c097fe5cd99ec9c7e592e93ce658a2a7 Mon Sep 17 00:00:00 2001
From: Jonathan Tapia <jonathan.tapia@magmalabs.io>
Date: Tue, 26 Jul 2022 11:56:02 -0500
Subject: [PATCH] Fix autoload issue on Solidus v3.1.0

---
 app/models/spree/user.rb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index ab0fd927..a97357f8 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -3,21 +3,12 @@
 module Spree
   class User < Spree::Base
     include UserMethods
+    include Spree::SoftDeletable
 
     devise :database_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :encryptable
     devise :confirmable if Spree::Auth::Config[:confirmable]
 
-    if defined?(Spree::SoftDeletable)
-      include Spree::SoftDeletable
-    else
-      acts_as_paranoid
-      include Spree::ParanoiaDeprecations
-
-      include Discard::Model
-      self.discard_column = :deleted_at
-    end
-
     after_destroy :scramble_email_and_password
     after_discard :scramble_email_and_password