Merge pull request #156 from dbarzin/dev

fix import bug
dbarzin · Oct 4, 2024 · fcd16d7 · fcd16d7
2 parents 64173d9 + 2ecebc1
commit fcd16d7
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/app/Http/Controllers/MeasureImportController.php b/app/Http/Controllers/MeasureImportController.php
@@ -99,23 +99,23 @@ function ($e) use ($model) {
                 );
                 // Get full path
                 $fileName = Storage::disk('local')->path($file);
-
-                // XLSX
-                $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
-                $reader->setReadDataOnly(true);
-                $spreadsheet = $reader->load($fileName);
-
-                $sheet = $spreadsheet->getSheet($spreadsheet->getFirstSheetIndex());
-                $data = $sheet->toArray();
-
-                if ($this->canImportFromFile($data, $request->has('clean'), $errors)) {
-                    // Clear database
-                    if ($request->has('clean')) {
-                        $this->clean();
-                        $errors->push('Database cleared');
-                    }
-                    $this->importFromFile($data, $errors);
+            }
+
+            // XLSX
+            $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+            $reader->setReadDataOnly(true);
+            $spreadsheet = $reader->load($fileName);
+
+            $sheet = $spreadsheet->getSheet($spreadsheet->getFirstSheetIndex());
+            $data = $sheet->toArray();
+
+            if ($this->canImportFromFile($data, $request->has('clean'), $errors)) {
+                // Clear database
+                if ($request->has('clean')) {
+                    $this->clean();
+                    $errors->push('Database cleared');
                 }
+                $this->importFromFile($data, $errors);
             }
         } finally {
             if ($request->file()) {