From 37d6701780fddd28c2d439570baf6d4a8151307c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 13 Jan 2022 15:10:43 +1100 Subject: [PATCH] Adjust invitation controller to deal with deleted contacts --- app/Http/Controllers/ClientPortal/InvitationController.php | 4 ++++ app/Http/Middleware/CheckClientExistence.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index bc0a2b5cc6a1..24ff67640387 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -87,6 +87,10 @@ class InvitationController extends Controller if(!$invitation) 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 */ $client_contact = $invitation->contact; diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php index 05ecd8214780..f8238db1e6e2 100644 --- a/app/Http/Middleware/CheckClientExistence.php +++ b/app/Http/Middleware/CheckClientExistence.php @@ -34,7 +34,7 @@ class CheckClientExistence ->where('email', auth('contact')->user()->email) ->whereNotNull('email') ->where('email', '<>', '') - ->whereNull('deleted_at') + // ->whereNull('deleted_at') ->distinct('company_id') ->distinct('email') ->whereNotNull('company_id')