close #2292 Fixed: Unable to change the customer of a duplicated invoice

akaunting · Nov 8, 2021 · 9ddbedd · 9ddbedd
1 parent d9d0e09
commit 9ddbedd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/Abstracts/View/Components/DocumentForm.php b/app/Abstracts/View/Components/DocumentForm.php
@@ -456,8 +456,8 @@ protected function getContacts($type, $document, $contacts)
             $contacts = Contact::enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
         }
 
-        if (!empty($document) && ($document->contact && !$contacts->has($document->contact_id))) {
-            $contacts->put($document->contact->id, $document->contact->name);
+        if (!empty($document) && ($document->contact && !$contacts->contains('id', $document->contact_id))) {
+            $contacts->push($document->contact);
         }
 
         return $contacts;

diff --git a/app/View/Components/SelectContactCard.php b/app/View/Components/SelectContactCard.php
@@ -71,6 +71,10 @@ public function render()
     {
         if (empty($this->contacts)) {
             $this->contacts = Contact::{$this->type}()->enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
+
+            if (!empty($this->contact) && (!$this->contacts->contains('id', $contact->id))) {
+                $this->contacts->push($this->contact);
+            }
         }
 
         if (empty($this->searchRoute)) {