From 132f053b028db88e481b624f8508176cfe17a68c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 15 Jan 2025 12:11:49 +1100
Subject: [PATCH] Always update designs post self update

---
 app/Http/Controllers/ClientPortal/InvitationController.php | 2 ++
 app/Http/Controllers/ClientPortal/NinjaPlanController.php  | 1 +
 app/Http/Controllers/SelfUpdateController.php              | 1 +
 app/Http/Middleware/CheckClientExistence.php               | 2 ++
 app/Models/Presenters/ClientPresenter.php                  | 2 +-
 app/Services/Invoice/AddGatewayFee.php                     | 2 +-
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index faffb56c92..80579759c8 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -262,6 +262,7 @@ class InvitationController extends Controller
             abort(403, 'You are not authorized to view this resource');
         }
 
+        request()->session()->invalidate();
         auth()->guard('contact')->loginUsingId($contact->id, true);
 
         return redirect()->route('client.payments.show', $payment->hashed_id);
@@ -279,6 +280,7 @@ class InvitationController extends Controller
             $invitation->contact->restore();
         }
 
+        request()->session()->invalidate();
         auth()->guard('contact')->loginUsingId($invitation->contact->id, true);
 
         $invoice = $invitation->invoice->service()->removeUnpaidGatewayFees()->save();
diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 48d1c467e9..3cfe055154 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -54,6 +54,7 @@ class NinjaPlanController extends Controller
         if (MultiDB::findAndSetDbByContactKey($contact_key) && $client_contact = ClientContact::where('contact_key', $contact_key)->first()) {
             nlog('Ninja Plan Controller - Found and set Client Contact');
 
+            request()->session()->invalidate();
             Auth::guard('contact')->loginUsingId($client_contact->id, true);
 
             return $this->plan();
diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 583a9b7ab2..98cff35d79 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -126,6 +126,7 @@ class SelfUpdateController extends BaseController
         Artisan::call('migrate', ['--force' => true]);
         Artisan::call('config:clear');
         Artisan::call('cache:clear');
+        Artisan::call('ninja:design');
 
         // $this->runModelChecks();
 
diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php
index ded0b517ae..fa8954387e 100644
--- a/app/Http/Middleware/CheckClientExistence.php
+++ b/app/Http/Middleware/CheckClientExistence.php
@@ -56,6 +56,8 @@ class CheckClientExistence
         }
 
         if (count($multiple_contacts) == 1 && ! Auth::guard('contact')->check()) {
+            
+            request()->session()->invalidate();
             Auth::guard('contact')->loginUsingId($multiple_contacts[0]->id, true);
 
             auth()->guard('contact')->user()->loadMissing(['client' => function ($query) {
diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php
index bb9a779886..0b9db54582 100644
--- a/app/Models/Presenters/ClientPresenter.php
+++ b/app/Models/Presenters/ClientPresenter.php
@@ -63,7 +63,7 @@ class ClientPresenter extends EntityPresenter
             return $primary_contact->email;
         }
 
-        $contact = $this->entity->contacts->whereNotNull('email')->first();
+        $contact = $this->entity->contacts->where('email', '!=', '')->first();
 
         return $contact ? $contact->email : 'No Email Set';
     }
diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php
index 8895e335c9..4771c26e8a 100644
--- a/app/Services/Invoice/AddGatewayFee.php
+++ b/app/Services/Invoice/AddGatewayFee.php
@@ -33,7 +33,7 @@ class AddGatewayFee extends AbstractService
             return $this->invoice;
         }
 
-        return $gateway_fee > 0 $this->processGatewayFee($gateway_fee) : $this->processGatewayDiscount($gateway_fee);
+        return $gateway_fee > 0 ? $this->processGatewayFee($gateway_fee) : $this->processGatewayDiscount($gateway_fee);
 
     }