From 434d2f6763b4a53447b0941c3dc4c42be2fbe095 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 15 Mar 2023 11:05:58 +1100
Subject: [PATCH] Allow removing deleted user

---
 app/Http/Controllers/UserController.php             | 6 +++---
 app/Http/Requests/User/DetachCompanyUserRequest.php | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index a186d7f26d51..ceb4c154df39 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -592,9 +592,9 @@ class UserController extends BaseController
      */
     public function detach(DetachCompanyUserRequest $request, User $user)
     {
-        if ($request->entityIsDeleted($user)) {
-            return $request->disallowUpdate();
-        }
+        // if ($request->entityIsDeleted($user)) {
+        //     return $request->disallowUpdate();
+        // }
 
         $company_user = CompanyUser::whereUserId($user->id)
                                     ->whereCompanyId(auth()->user()->companyId())
diff --git a/app/Http/Requests/User/DetachCompanyUserRequest.php b/app/Http/Requests/User/DetachCompanyUserRequest.php
index 72b081f7424d..843b84d98371 100644
--- a/app/Http/Requests/User/DetachCompanyUserRequest.php
+++ b/app/Http/Requests/User/DetachCompanyUserRequest.php
@@ -12,14 +12,10 @@
 namespace App\Http\Requests\User;
 
 use App\Http\Requests\Request;
-use App\Models\User;
-use App\Utils\Traits\ChecksEntityStatus;
 use App\Utils\Traits\MakesHash;
 
 class DetachCompanyUserRequest extends Request
 {
-    use MakesHash;
-    use ChecksEntityStatus;
 
     /**
      * Determine if the user is authorized to make this request.