Fix for CSV import

apamwach · Apr 18, 2018 · 12bd18f · 12bd18f
1 parent 9ad6cae
commit 12bd18f
Show file tree

Hide file tree

Showing 3 changed files with 306 additions and 233 deletions.
diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php
@@ -35,6 +35,9 @@
 use stdClass;
 use Utils;
 use Carbon;
+use League\Csv\Reader;
+use League\Csv\Statement;
+
 
 /**
  * Class ImportService.
@@ -653,8 +656,11 @@ public function mapFile($entityType, $filename, $columns, $map)
     private function getCsvData($fileName)
     {
         $this->checkForFile($fileName);
-        $file = file_get_contents($fileName);
-        $data = array_map("str_getcsv", preg_split('/\r*\n+|\r+/', $file));
+
+        $csv = Reader::createFromPath($fileName, 'r');
+        //$csv->setHeaderOffset(0); //set the CSV header offset
+        $stmt = new Statement();
+        $data = iterator_to_array($stmt->process($csv));
 
         if (count($data) > 0) {
             $headers = $data[0];

diff --git a/composer.json b/composer.json
@@ -46,6 +46,7 @@
         "laravel/socialite": "~3.0",
         "laravel/tinker": "^1.0",
         "laravelcollective/html": "5.4.*",
+        "league/csv": "^9.1",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-rackspace": "~1.0",
         "league/fractal": "0.13.*",