diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index f821631c6b87..02b7353de0b1 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -84,6 +84,7 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [
'root' => 'themes',
'message' => ctrans('texts.security_confirmation'),
+ 'redirect_url' => request()->hasHeader('X-React') ? 'https://app.invoicing.co/#/' : url('/'),
]);
}
}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 60dbcf4d735f..bcabe5c16c0b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -231,8 +231,11 @@ class UserController extends BaseController
$return_user_collection = collect();
- $users->each(function ($user, $key) use ($action, $return_user_collection) {
- if (auth()->user()->can('edit', $user)) {
+ /** @var \App\Models\User $logged_in_user */
+ $logged_in_user = auth()->user();
+
+ $users->each(function ($user, $key) use ($logged_in_user, $action, $return_user_collection) {
+ if ($logged_in_user->can('edit', $user)) {
$this->user_repo->{$action}($user);
$return_user_collection->push($user->id);
@@ -251,12 +254,11 @@ class UserController extends BaseController
*/
public function detach(DetachCompanyUserRequest $request, User $user)
{
- // if ($request->entityIsDeleted($user)) {
- // return $request->disallowUpdate();
- // }
+ /** @var \App\Models\User $logged_in_user */
+ $logged_in_user = auth()->user();
$company_user = CompanyUser::whereUserId($user->id)
- ->whereCompanyId(auth()->user()->companyId())
+ ->whereCompanyId($logged_in_user->companyId())
->withTrashed()
->first();
diff --git a/resources/views/themes/ninja2020/auth/confirmed.blade.php b/resources/views/themes/ninja2020/auth/confirmed.blade.php
index 7bbad769ec40..ca147c2c0c93 100644
--- a/resources/views/themes/ninja2020/auth/confirmed.blade.php
+++ b/resources/views/themes/ninja2020/auth/confirmed.blade.php
@@ -8,7 +8,7 @@
{{ $message }}
- {{ ctrans('texts.return_to_login') }} + {{ ctrans('texts.return_to_login') }}