From 49eb2b63dfb79ed3f2b659aa5b3d96611f3a6b6e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 16 Jul 2022 14:43:10 +1000
Subject: [PATCH] Add rules for invitations

---
 .../ClientPortal/PaymentController.php           | 16 ++++++++++++++--
 app/Http/Requests/Request.php                    |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index add7551bd9de..b2401a99683c 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -97,8 +97,20 @@ class PaymentController extends Controller
         $client = $invoice ? $invoice->client : auth()->guard('contact')->user()->client;
 
         // 09-07-2022 catch duplicate responses for invoices that already paid here.
-        if($invoice && $invoice->status_id == Invoice::STATUS_PAID)
-            abort(400, 'Invoice paid. Duplicate submission');
+        if($invoice && $invoice->status_id == Invoice::STATUS_PAID){
+
+            $data = [
+                'invoice' => $invoice,
+                'key' => false
+            ];
+
+            if ($request->query('mode') === 'fullscreen') {
+                return render('invoices.show-fullscreen', $data);
+            }
+
+            return $this->render('invoices.show', $data);
+
+        }
 
             return $gateway
                 ->driver($client)
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 1c6b7c94db8d..34ca17ec0211 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -123,7 +123,7 @@ class Request extends FormRequest
             }
         }
 
-        if (isset($input['invitations'])) {
+        if (isset($input['invitations']) && is_array($input['invitations'])) {
             foreach ($input['invitations'] as $key => $value) {
                 if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
                     unset($input['invitations'][$key]['id']);