mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Show contact email on error screen
This commit is contained in:
parent
36211b3ea9
commit
88bed420b1
@ -58,8 +58,7 @@ class Authenticate
|
|||||||
|
|
||||||
if ($contact_key) {
|
if ($contact_key) {
|
||||||
$contact = $this->getContact($contact_key);
|
$contact = $this->getContact($contact_key);
|
||||||
} elseif (! empty($request->invitation_key)) {
|
} elseif ($invitation = $this->getInvitation($request->invitation_key)) {
|
||||||
$invitation = $this->getInvitation($request->invitation_key);
|
|
||||||
$contact = $invitation->contact;
|
$contact = $invitation->contact;
|
||||||
Session::put('contact_key', $contact->contact_key);
|
Session::put('contact_key', $contact->contact_key);
|
||||||
} else {
|
} else {
|
||||||
@ -104,6 +103,10 @@ class Authenticate
|
|||||||
*/
|
*/
|
||||||
protected function getInvitation($key)
|
protected function getInvitation($key)
|
||||||
{
|
{
|
||||||
|
if (! $key) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// check for extra params at end of value (from website feature)
|
// check for extra params at end of value (from website feature)
|
||||||
list($key) = explode('&', $key);
|
list($key) = explode('&', $key);
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<div class="container" style="min-height:400px">
|
<div class="container" style="min-height:400px">
|
||||||
<h3>{{ trans('texts.error_title') }}...</h3>
|
<h3>{{ trans('texts.error_title') }}...</h3>
|
||||||
<h4>{{ $error }}</h4>
|
<h4>{{ $error }}</h4>
|
||||||
<h4>{{ trans('texts.error_contact_text', ['mailaddress' => env('MAIL_USERNAME')]) }}</h4>
|
<h4>{{ trans('texts.error_contact_text', ['mailaddress' => env('CONTACT_EMAIL', env('MAIL_USERNAME'))]) }}</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user