diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index ff471adc4b..2e1137bcd2 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -286,6 +286,7 @@ class Importer extends Component 'serial' => trans('general.license_serial'), 'email' => trans('general.importer.checked_out_to_email'), 'username' => trans('general.importer.checked_out_to_username'), + 'manufacturer' => trans('general.manufacturer'), ]; $this->users_fields = [ diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index 02ef05af5c..ce07585ab5 100644 --- a/app/Importer/LicenseImporter.php +++ b/app/Importer/LicenseImporter.php @@ -66,6 +66,8 @@ class LicenseImporter extends ItemImporter $this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); + $this->item['manufacturer'] = $this->createOrFetchManufacturer($this->findCsvMatch($row, 'manufacturer')); + if($this->item['reassignable'] == "") { $this->item['reassignable'] = 1;