diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php index fd2d91300..220fb181b 100644 --- a/app/Console/Commands/ObjectImportCommand.php +++ b/app/Console/Commands/ObjectImportCommand.php @@ -286,7 +286,7 @@ class ObjectImportCommand extends Command { /** * Finds a category with the same name and item type in the database, otherwise creates it * @param $asset_category string - * @param $item_type string + * @param $item_type stringI * @return Category */ public function createOrFetchCategory($asset_category, $item_type) @@ -348,7 +348,7 @@ class ObjectImportCommand extends Command { $this->log('Company ' . $asset_company_name . ' was created'); return $company; } else { - $this->jsonError('Company', $company->getErrors()); + $this->log('Company', $company->getErrors()); } } else { $this->companies->add($company); @@ -470,7 +470,7 @@ class ObjectImportCommand extends Command { $this->log('Location ' . $asset_location . ' was created'); return $location; } else { - $this->jsonError('Location', $location->getErrors()) ; + $this->log('Location', $location->getErrors()) ; return $location; } } else { @@ -512,7 +512,7 @@ class ObjectImportCommand extends Command { $this->log('Supplier ' . $supplier_name . ' was created'); return $supplier; } else { - $this->jsonError('Supplier', $supplier->getErrors()); + $this->log('Supplier', $supplier->getErrors()); return $supplier; } } else { diff --git a/resources/views/hardware/import.blade.php b/resources/views/hardware/import.blade.php index 282b57955..0ad8556c0 100644 --- a/resources/views/hardware/import.blade.php +++ b/resources/views/hardware/import.blade.php @@ -73,24 +73,21 @@
Asset | -Field | -Parameter | -Errors | +Errors | @foreach (session('import_errors') as $asset => $error)
---|---|---|---|---|
{{ $asset }} | - @foreach ($error as $field => $values ) -{{ $field }} | - @foreach( $values as $fieldName=>$errorString) -{{$fieldName}} | -{{$errorString[0]}} | - @endforeach +{{ $field }}: + @foreach( $values as $errorString) + {{$errorString[0]}} + @endforeach + | @endforeach