From 244e4ec11f389dd7e775a9a233255ef9b0b21e26 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 20 Jul 2023 13:48:51 +0100 Subject: [PATCH 1/2] Added manufacturer back into license importer Signed-off-by: snipe --- app/Http/Livewire/Importer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index ff471adc4..2e1137bcd 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 = [ From d7ac8ef61893e771fa98e364596da103aad15b19 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 20 Jul 2023 14:02:54 +0100 Subject: [PATCH 2/2] Added manufacturer to licenses Signed-off-by: snipe --- app/Importer/LicenseImporter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index 02ef05af5..ce07585ab 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;