From f950f84b61ae5b77bea7d6ac8cdaf77bf4f56e8d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 25 Jan 2021 21:54:36 +1100
Subject: [PATCH] Fix for 500 on updating quote by removing contacts

---
 app/Http/Requests/Quote/StoreQuoteRequest.php | 58 +++++--------------
 .../Requests/Quote/UpdateQuoteRequest.php     | 12 +---
 app/Services/Quote/CreateInvitations.php      |  1 +
 3 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php
index 48e2ee5508d4..c75e571c9d64 100644
--- a/app/Http/Requests/Quote/StoreQuoteRequest.php
+++ b/app/Http/Requests/Quote/StoreQuoteRequest.php
@@ -32,51 +32,6 @@ class StoreQuoteRequest extends Request
         return auth()->user()->can('create', Quote::class);
     }
 
-    protected function prepareForValidation()
-    {
-        $input = $this->all();
-
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if ($input['client_id']) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
-
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['client_contacts'])) {
-            foreach ($input['client_contacts'] as $key => $contact) {
-                if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
-                    unset($input['client_contacts'][$key]);
-                }
-            }
-        }
-
-        if (isset($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']);
-                }
-
-                if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
-
-        $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
-        //$input['line_items'] = json_encode($input['line_items']);
-        $this->replace($input);
-    }
-
     public function rules()
     {
         $rules = [];
@@ -98,4 +53,17 @@ class StoreQuoteRequest extends Request
 
         return $rules;
     }
+
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+        $input = $this->decodePrimaryKeys($input);
+
+        $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        $input['amount'] = 0;
+        $input['balance'] = 0;
+        
+        $this->replace($input);
+    }
 }
diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php
index d9f65c710b06..019c630aac3d 100644
--- a/app/Http/Requests/Quote/UpdateQuoteRequest.php
+++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php
@@ -59,22 +59,12 @@ class UpdateQuoteRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if (isset($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         if (isset($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         }
 
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
         if (array_key_exists('documents', $input)) {
             unset($input['documents']);
         }
diff --git a/app/Services/Quote/CreateInvitations.php b/app/Services/Quote/CreateInvitations.php
index 9ea688641a2b..0229e7ccccf2 100644
--- a/app/Services/Quote/CreateInvitations.php
+++ b/app/Services/Quote/CreateInvitations.php
@@ -41,6 +41,7 @@ class CreateInvitations
             $invitation = QuoteInvitation::whereCompanyId($this->quote->company_id)
                 ->whereClientContactId($contact->id)
                 ->whereQuoteId($this->quote->id)
+                ->withTrashed()
                 ->first();
 
             if (! $invitation && $contact->send_email) {