From 0b71bc03b019b284c857bd5a3ab706d50315d3c8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 24 May 2021 10:53:04 +1000 Subject: [PATCH] Fixes for User Route --- app/Http/Controllers/UserController.php | 4 +++- app/Repositories/UserRepository.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 483a32bb3c85..196bb823ea92 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -215,7 +215,9 @@ class UserController extends BaseController event(new UserWasCreated($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); - return $this->itemResponse($user->fresh()); + $user->setCompany($company); + + return $this->itemResponse($user); } /** diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index fb9bfcd49ff6..03d2ceadc742 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -114,7 +114,7 @@ class UserRepository extends BaseRepository } $user->restore(); - return $user; + return $user->fresh(); } public function destroy(array $data, User $user)