mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 15:09:40 -08:00
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
This commit is contained in:
commit
f0d05a7461
|
@ -627,7 +627,11 @@ class AssetsController extends Controller
|
||||||
$csv->setHeaderOffset(0);
|
$csv->setHeaderOffset(0);
|
||||||
$header = $csv->getHeader();
|
$header = $csv->getHeader();
|
||||||
$isCheckinHeaderExplicit = in_array('checkin date', (array_map('strtolower', $header)));
|
$isCheckinHeaderExplicit = in_array('checkin date', (array_map('strtolower', $header)));
|
||||||
|
try {
|
||||||
$results = $csv->getRecords();
|
$results = $csv->getRecords();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
return back()->with('error', 'There was an error reading the CSV file: '.$e->getMessage());
|
||||||
|
}
|
||||||
$item = [];
|
$item = [];
|
||||||
$status = [];
|
$status = [];
|
||||||
$status['error'] = [];
|
$status['error'] = [];
|
||||||
|
|
Loading…
Reference in a new issue