From 7d62cd5e50aae47b109a744afc4df6ca20a06339 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 5 Apr 2022 09:52:10 +1000
Subject: [PATCH] Set correct order of session middleware

---
 app/Http/Controllers/ClientPortal/InvitationController.php | 2 +-
 app/Http/Kernel.php                                        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 7c22fe41f86d..dc1a3cd21afe 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -210,7 +210,7 @@ class InvitationController extends Controller
 
     public function paymentRouter(string $contact_key, string $payment_id)
     {
-        $contact = ClientContact::where('contact_key', $contact_key)->firstOrFail();
+        $contact = ClientContact::withTrashed()->where('contact_key', $contact_key)->firstOrFail();
         $payment = Payment::find($this->decodePrimaryKey($payment_id));
 
         if($payment->client_id != $contact->client_id)
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 515d5f0df540..7cd6458ed8be 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -170,6 +170,8 @@ class Kernel extends HttpKernel
 
 
     protected $middlewarePriority = [
+        EncryptCookies::class,
+        StartSession::class,
         SessionDomains::class,
         Cors::class,
         SetDomainNameDb::class,