mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 13:12:50 +01:00
Merge pull request #7492 from turbo124/v5-develop
Fixes for bug that sends multiple emails per import
This commit is contained in:
commit
dc6638b9d2
@ -562,7 +562,7 @@ class BaseImport
|
||||
}
|
||||
}
|
||||
|
||||
protected function finalizeImport()
|
||||
public function finalizeImport()
|
||||
{
|
||||
$data = [
|
||||
'errors' => $this->error_array,
|
||||
|
@ -60,10 +60,7 @@ class Csv extends BaseImport implements ImportInterface
|
||||
) {
|
||||
$this->{$entity}();
|
||||
}
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
|
||||
}
|
||||
|
||||
public function client()
|
||||
|
@ -41,7 +41,7 @@ class Freshbooks extends BaseImport
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
// $this->finalizeImport();
|
||||
}
|
||||
|
||||
public function client()
|
||||
|
@ -39,7 +39,7 @@ class Invoice2Go extends BaseImport
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
// $this->finalizeImport();
|
||||
}
|
||||
|
||||
|
||||
|
@ -38,7 +38,7 @@ class Invoicely extends BaseImport
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
// $this->finalizeImport();
|
||||
}
|
||||
|
||||
public function client()
|
||||
|
@ -54,7 +54,7 @@ class Wave extends BaseImport implements ImportInterface
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
// $this->finalizeImport();
|
||||
}
|
||||
|
||||
public function client()
|
||||
|
@ -40,7 +40,7 @@ class Zoho extends BaseImport
|
||||
|
||||
//collate any errors
|
||||
|
||||
$this->finalizeImport();
|
||||
// $this->finalizeImport();
|
||||
}
|
||||
|
||||
public function client()
|
||||
|
@ -79,6 +79,8 @@ class CSVIngest implements ShouldQueue {
|
||||
|
||||
}
|
||||
|
||||
$engine->finalizeImport();
|
||||
|
||||
$this->checkContacts();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user