Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 06:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for landing url after confirmation

Browse Source
This commit is contained in:
David Bomba 2023-06-11 16:45:40 +10:00
parent 354c38e4ab
commit 10a83af0af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Traits/VerifiesUserEmail.php
View File

@ -38,7 +38,7 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.wrong_confirmation'), 'message' => ctrans('texts.wrong_confirmation'),
'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]); 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/')]);
} }
$user->email_verified_at = now(); $user->email_verified_at = now();
@ -49,18 +49,18 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), 'message' => ctrans('texts.security_confirmation'),
'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'), 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
]); ]);
} }
if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) { if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) {
return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id, 'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]); return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id, 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/')]);
} }
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), 'message' => ctrans('texts.security_confirmation'),
'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'), 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
]); ]);
} }
@ -89,7 +89,7 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), 'message' => ctrans('texts.security_confirmation'),
'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'), 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
]); ]);
} }
} }