Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 02:39:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7492 from turbo124/v5-develop

Browse Source 
Fixes for bug that sends multiple emails per import
This commit is contained in:
David Bomba 2022-06-01 08:09:01 +10:00 committed by GitHub
commit dc6638b9d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Import/Providers/BaseImport.php
View File

@ -562,7 +562,7 @@ class BaseImport
} }
} }
protected function finalizeImport() public function finalizeImport()
{ {
$data = [ $data = [
'errors' => $this->error_array, 'errors' => $this->error_array,

3
app/Import/Providers/Csv.php
View File

@ -61,9 +61,6 @@ class Csv extends BaseImport implements ImportInterface
$this->{$entity}(); $this->{$entity}();
} }
//collate any errors
$this->finalizeImport();
} }
public function client() public function client()

2
app/Import/Providers/Freshbooks.php
View File

@ -41,7 +41,7 @@ class Freshbooks extends BaseImport
//collate any errors //collate any errors
$this->finalizeImport(); // $this->finalizeImport();
} }
public function client() public function client()

2
app/Import/Providers/Invoice2Go.php
View File

@ -39,7 +39,7 @@ class Invoice2Go extends BaseImport
//collate any errors //collate any errors
$this->finalizeImport(); // $this->finalizeImport();
} }

2
app/Import/Providers/Invoicely.php
View File

@ -38,7 +38,7 @@ class Invoicely extends BaseImport
//collate any errors //collate any errors
$this->finalizeImport(); // $this->finalizeImport();
} }
public function client() public function client()

2
app/Import/Providers/Wave.php
View File

@ -54,7 +54,7 @@ class Wave extends BaseImport implements ImportInterface
//collate any errors //collate any errors
$this->finalizeImport(); // $this->finalizeImport();
} }
public function client() public function client()

2
app/Import/Providers/Zoho.php
View File

@ -40,7 +40,7 @@ class Zoho extends BaseImport
//collate any errors //collate any errors
$this->finalizeImport(); // $this->finalizeImport();
} }
public function client() public function client()

2
app/Jobs/Import/CSVIngest.php
View File

@ -79,6 +79,8 @@ class CSVIngest implements ShouldQueue {
} }
$engine->finalizeImport();
$this->checkContacts(); $this->checkContacts();
} }