Skip row when parser returns false

Cyber-Duck · Aug 27, 2017 · 8cfbf3b · 8cfbf3b
1 parent fc41ddd
commit 8cfbf3b
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/Importer/AbstractSpreadsheet.php b/src/Importer/AbstractSpreadsheet.php
@@ -72,11 +72,13 @@ public function getCollection()
                 } else {
                     $data = $this->parser->transform($row, $headers);
 
-                    if ($this->model) {
-                        $data = $this->model->getQuery()->insert($data);
-                    }
+                    if ($data !== false) {
+                        if ($this->model) {
+                            $data = $this->model->getQuery()->newInstance($data);
+                        }
 
-                    $collection->push($data);
+                        $collection->push($data);
+                    }
                 }
             }
         }
@@ -108,12 +110,14 @@ public function save($updateIfEquals = [])
                     $headers = $row;
                 } else {
                     $data = $this->parser->transform($row, $headers);
-                    $when = array_intersect_key($data, $updateIfEquals);
-                    $values = array_diff($data, $when);
-                    if (!empty($when)) {
-                        $this->model->getQuery()->updateOrInsert($when, $values);
-                    } else {
-                        $this->model->getQuery()->insert($values);
+                    if ($data !== false) {
+                        $when = array_intersect_key($data, $updateIfEquals);
+                        $values = array_diff($data, $when);
+                        if (!empty($when)) {
+                            $this->model->getQuery()->updateOrInsert($when, $values);
+                        } else {
+                            $this->model->getQuery()->insert($values);
+                        }
                     }
                 }
             }