From 843d7c3bf4e1fc52b0d0a5c5e44906c5072dc879 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 20 Jul 2023 09:08:17 +1000
Subject: [PATCH] Adjustments for vendor imports

---
 app/Import/Providers/BaseImport.php   |  8 ++++++--
 app/Repositories/VendorRepository.php | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 0cb696bfde5c..5d6ef871dbd9 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -477,8 +477,12 @@ class BaseImport
                     }
                     
                     nlog($invoice_data);
+                    $saveable_invoice_data = $invoice_data;
+                    
+                    if(array_key_exists('payments', $saveable_invoice_data))
+                        unset($saveable_invoice_data['payments']);
 
-                    $invoice_repository->save($invoice_data, $invoice);
+                    $invoice_repository->save($saveable_invoice_data, $invoice);
 
                     $count++;
                     // If we're doing a generic CSV import, only import payment data if we're not importing a payment CSV.
@@ -504,7 +508,7 @@ class BaseImport
                                 ];
 
                                 /* Make sure we don't apply any payments to invoices with a Zero Amount*/
-                                if ($invoice->amount > 0) {
+                                if ($invoice->amount > 0 && $payment_data['amount'] > 0) {
                                     
                                     $payment = $payment_repository->save(
                                         $payment_data,
diff --git a/app/Repositories/VendorRepository.php b/app/Repositories/VendorRepository.php
index bb9266014701..f1eeb0e25962 100644
--- a/app/Repositories/VendorRepository.php
+++ b/app/Repositories/VendorRepository.php
@@ -43,10 +43,14 @@ class VendorRepository extends BaseRepository
      */
     public function save(array $data, Vendor $vendor) : ?Vendor
     {
-        $vendor->fill($data);
-        
-        nlog($data);
-        
+        $saveable_vendor = $data;
+
+        if(array_key_exists('contacts', $data)) {
+            unset($saveable_vendor['contacts']);
+        }
+
+        $vendor->fill($saveable_vendor);
+                
         $vendor->saveQuietly();
 
         if ($vendor->number == '' || ! $vendor->number) {