Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:37:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Skip blank rows in CSV import

Browse Source
This commit is contained in:
Hillel Coren 2017-01-08 16:13:23 +02:00
parent 7b92eb62fe
commit 7711d0a456
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Services/ImportService.php
View File

@ -252,6 +252,10 @@ class ImportService
$this->checkData($entityType, count($reader->all())); $this->checkData($entityType, count($reader->all()));
$reader->each(function ($row) use ($source, $entityType, &$row_list, &$results) { $reader->each(function ($row) use ($source, $entityType, &$row_list, &$results) {
if ($this->isRowEmpty($row)) {
return;
}
$data_index = $this->transformRow($source, $entityType, $row); $data_index = $this->transformRow($source, $entityType, $row);
if ($data_index !== false) { if ($data_index !== false) {
@ -286,8 +290,6 @@ class ImportService
*/ */
private function transformRow($source, $entityType, $row) private function transformRow($source, $entityType, $row)
{ {
// TODO skip import if row is blank
$transformer = $this->getTransformer($source, $entityType, $this->maps); $transformer = $this->getTransformer($source, $entityType, $this->maps);
// Create expesnse category // Create expesnse category
@ -620,6 +622,9 @@ class ImportService
} }
$row = $this->convertToObject($entityType, $row, $map); $row = $this->convertToObject($entityType, $row, $map);
if ($this->isRowEmpty($row)) {
continue;
}
$data_index = $this->transformRow($source, $entityType, $row); $data_index = $this->transformRow($source, $entityType, $row);
if ($data_index !== false) { if ($data_index !== false) {
@ -812,4 +817,17 @@ class ImportService
$this->maps['expense_category'][$name] = $category->id; $this->maps['expense_category'][$name] = $category->id;
} }
} }
private function isRowEmpty($row)
{
$isEmpty = true;
foreach ($row as $key => $val) {
if (trim($val)) {
$isEmpty = false;
}
}
return $isEmpty;
}
} }