diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 92d763dd2..027435e4d 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -441,6 +441,10 @@ class UsersController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->accessories->count().' accessories associated with them.')); } + if (($user->consumables) && ($user->consumables->count() > 0)) { + return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->consumables->count().' consumables associated with them.')); + } + if (($user->managedLocations()) && ($user->managedLocations()->count() > 0)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->managedLocations()->count().' locations that they manage.')); } diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 7cbbbdb10..10a5d8ba5 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -348,6 +348,12 @@ class UsersController extends Controller ->with('error', 'This user still has '.$accessoriesCount.' accessories associated with them.'); } + if (($user->consumables()) && (($consumablesCount = $user->consumables()->count())) > 0) { + // Redirect to the user management page + return redirect()->route('users.index') + ->with('error', 'This user still has '.$consumablesCount.' consumables associated with them.'); + } + if (($user->managedLocations()) && (($managedLocationsCount = $user->managedLocations()->count())) > 0) { // Redirect to the user management page return redirect()->route('users.index')