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

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2022-01-13 17:44:31 +11:00
commit d08aba3091
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -87,6 +87,10 @@ class InvitationController extends Controller
if(!$invitation) if(!$invitation)
return abort(404,'The resource is no longer available.'); return abort(404,'The resource is no longer available.');
/* 12/01/2022 Clean up an edge case where if the contact is trashed, restore if a invitation comes back. */
if($invitation->contact->trashed())
$invitation->contact->restore();
/* Return early if we have the correct client_hash embedded */ /* Return early if we have the correct client_hash embedded */
$client_contact = $invitation->contact; $client_contact = $invitation->contact;

2
app/Http/Middleware/CheckClientExistence.php
View File

@ -34,7 +34,7 @@ class CheckClientExistence
->where('email', auth('contact')->user()->email) ->where('email', auth('contact')->user()->email)
->whereNotNull('email') ->whereNotNull('email')
->where('email', '<>', '') ->where('email', '<>', '')
->whereNull('deleted_at') // ->whereNull('deleted_at')
->distinct('company_id') ->distinct('company_id')
->distinct('email') ->distinct('email')
->whereNotNull('company_id') ->whereNotNull('company_id')