From 0ea77d94c50553d3ff8c0d0d22fe83a1abd2a4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 9 Dec 2023 23:24:23 +0000 Subject: [PATCH] fixed user show api --- app/Http/Controllers/Api/Auth/Users.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/Users.php b/app/Http/Controllers/Api/Auth/Users.php index 2d769b0fe..4aafd9bc5 100644 --- a/app/Http/Controllers/Api/Auth/Users.php +++ b/app/Http/Controllers/Api/Auth/Users.php @@ -32,15 +32,17 @@ class Users extends ApiController */ public function show($id) { + $model_class = user_model_class(); + // Check if we're querying by id or email if (is_numeric($id)) { - $user = user_model_class()::with('companies', 'permissions', 'roles')->find($id); + $user = $model_class::with('companies', 'permissions', 'roles')->find($id); } else { - $user = user_model_class()::with('companies', 'permissions', 'roles')->where('email', $id)->first(); + $user = $model_class::with('companies', 'permissions', 'roles')->where('email', $id)->first(); } - if (! $user instanceof user_model_class()) { - return $this->errorInternal('No query results for model [' . user_model_class() . '] ' . $id); + if (! $user instanceof $model_class) { + return $this->errorInternal('No query results for model [' . $model_class . '] ' . $id); } return new Resource($user); @@ -86,7 +88,7 @@ class Users extends ApiController public function enable($user_id) { $user = user_model_class()::query()->isNotCustomer()->find($user_id); - + $user = $this->dispatch(new UpdateUser($user, request()->merge(['enabled' => 1]))); return new Resource($user->fresh());