From 55e7c8b000db7fdbdd0e50de5bc44423f71e107f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Jun 2022 07:49:33 +1000
Subject: [PATCH] Fixes for bug that sends multiple emails per import

---
 app/Import/Providers/BaseImport.php | 2 +-
 app/Import/Providers/Csv.php        | 5 +----
 app/Import/Providers/Freshbooks.php | 2 +-
 app/Import/Providers/Invoice2Go.php | 2 +-
 app/Import/Providers/Invoicely.php  | 2 +-
 app/Import/Providers/Wave.php       | 2 +-
 app/Import/Providers/Zoho.php       | 2 +-
 app/Jobs/Import/CSVIngest.php       | 2 ++
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 6eb41900d995..7af0e1a1b8d3 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -562,7 +562,7 @@ class BaseImport
 		}
 	}
 
-	protected function finalizeImport()
+	public function finalizeImport()
 	{
 		$data = [
 			'errors'  => $this->error_array,
diff --git a/app/Import/Providers/Csv.php b/app/Import/Providers/Csv.php
index 34c85e241dd9..b819550d0d7d 100644
--- a/app/Import/Providers/Csv.php
+++ b/app/Import/Providers/Csv.php
@@ -60,10 +60,7 @@ class Csv extends BaseImport implements ImportInterface
         ) {
             $this->{$entity}();
         }
-
-        //collate any errors
-
-        $this->finalizeImport();
+        
     }
 
     public function client()
diff --git a/app/Import/Providers/Freshbooks.php b/app/Import/Providers/Freshbooks.php
index e4ece2c78eb8..458b671de894 100644
--- a/app/Import/Providers/Freshbooks.php
+++ b/app/Import/Providers/Freshbooks.php
@@ -41,7 +41,7 @@ class Freshbooks extends BaseImport
 
         //collate any errors
 
-        $this->finalizeImport();
+        // $this->finalizeImport();
     }
 
     public function client()
diff --git a/app/Import/Providers/Invoice2Go.php b/app/Import/Providers/Invoice2Go.php
index 86763110aaa2..a3d944fa9a69 100644
--- a/app/Import/Providers/Invoice2Go.php
+++ b/app/Import/Providers/Invoice2Go.php
@@ -39,7 +39,7 @@ class Invoice2Go extends BaseImport
 
         //collate any errors
 
-        $this->finalizeImport();
+        // $this->finalizeImport();
     }
 
 
diff --git a/app/Import/Providers/Invoicely.php b/app/Import/Providers/Invoicely.php
index 3ed6e67c6392..ff9aeedfc24b 100644
--- a/app/Import/Providers/Invoicely.php
+++ b/app/Import/Providers/Invoicely.php
@@ -38,7 +38,7 @@ class Invoicely extends BaseImport
 
         //collate any errors
 
-        $this->finalizeImport();
+        // $this->finalizeImport();
     }
 
     public function client()
diff --git a/app/Import/Providers/Wave.php b/app/Import/Providers/Wave.php
index 8fa489cf49cf..d2d889723329 100644
--- a/app/Import/Providers/Wave.php
+++ b/app/Import/Providers/Wave.php
@@ -54,7 +54,7 @@ class Wave extends BaseImport implements ImportInterface
 
         //collate any errors
 
-        $this->finalizeImport();
+        // $this->finalizeImport();
     }
 
     public function client()
diff --git a/app/Import/Providers/Zoho.php b/app/Import/Providers/Zoho.php
index 9ddb12390bcd..668dda234bc8 100644
--- a/app/Import/Providers/Zoho.php
+++ b/app/Import/Providers/Zoho.php
@@ -40,7 +40,7 @@ class Zoho extends BaseImport
 
         //collate any errors
 
-        $this->finalizeImport();
+        // $this->finalizeImport();
     }
 
     public function client()
diff --git a/app/Jobs/Import/CSVIngest.php b/app/Jobs/Import/CSVIngest.php
index 6a7c4e0032a5..67ab635527b9 100644
--- a/app/Jobs/Import/CSVIngest.php
+++ b/app/Jobs/Import/CSVIngest.php
@@ -79,6 +79,8 @@ class CSVIngest implements ShouldQueue {
 
         }
 
+        $engine->finalizeImport();
+        
         $this->checkContacts();
     }