diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php index be117d6fae..97dbc068cc 100644 --- a/app/Importer/AssetImporter.php +++ b/app/Importer/AssetImporter.php @@ -71,7 +71,7 @@ class AssetImporter extends ItemImporter $this->log("No Matching Asset, Creating a new one"); $asset = new Asset; } - + $this->item['notes'] = $this->findCsvMatch($row, 'asset_notes'); $this->item['image'] = $this->findCsvMatch($row, "image"); $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));; $asset->requestable = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable")); diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php index 27b21a431b..9bf84ae194 100644 --- a/app/Importer/ItemImporter.php +++ b/app/Importer/ItemImporter.php @@ -208,6 +208,7 @@ class ItemImporter extends Importer $this->log("Matching Model found, updating it."); $item = $this->sanitizeItemForStoring($asset_model, $editingModel); $item['name'] = $asset_model_name; + $item['notes'] = $this->findCsvMatch($row, 'model_notes'); if(!empty($asset_modelNumber)){ $item['model_number'] = $asset_modelNumber; @@ -224,6 +225,7 @@ class ItemImporter extends Importer $item = $this->sanitizeItemForStoring($asset_model, $editingModel); $item['name'] = $asset_model_name; $item['model_number'] = $asset_modelNumber; + $item['notes'] = $this->findCsvMatch($row, 'model_notes'); $asset_model->fill($item); $item = null; diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue index f208a84079..9cf4e61fd7 100644 --- a/resources/assets/js/components/importer/importer-file.vue +++ b/resources/assets/js/components/importer/importer-file.vue @@ -130,7 +130,6 @@ {id: 'location', text: 'Location' }, {id: 'maintained', text: 'Maintained' }, {id: 'manufacturer', text: 'Manufacturer' }, - {id: 'notes', text: 'Notes' }, {id: 'order_number', text: 'Order Number' }, {id: 'purchase_cost', text: 'Purchase Cost' }, {id: 'purchase_date', text: 'Purchase Date' }, @@ -143,10 +142,13 @@ ], accessories:[ {id: 'model_number', text: 'Model Number'}, + {id: 'notes', text: 'Notes' }, ], assets: [ {id: 'asset_tag', text: 'Asset Tag' }, {id: 'asset_model', text: 'Model Name' }, + {id: 'asset_notes', text: 'Asset Notes' }, + {id: 'model_notes', text: 'Model Notes' }, {id: 'checkout_class', text: 'Checkout Type' }, {id: 'checkout_location', text: 'Checkout Location' }, {id: 'image', text: 'Image Filename' }, @@ -159,6 +161,7 @@ {id: 'item_no', text: "Item Number"}, {id: 'model_number', text: "Model Number"}, {id: 'min_amt', text: "Minimum Quantity"}, + {id: 'notes', text: 'Notes' }, ], licenses: [ {id: 'asset_tag', text: 'Assigned To Asset'}, @@ -166,6 +169,7 @@ {id: 'full_name', text: 'Full Name' }, {id: 'license_email', text: 'Licensed To Email' }, {id: 'license_name', text: 'Licensed To Name' }, + {id: 'notes', text: 'Notes' }, {id: 'purchase_order', text: 'Purchase Order' }, {id: 'reassignable', text: 'Reassignable' }, {id: 'seats', text: 'Seats' }, @@ -178,6 +182,7 @@ {id: 'phone_number', text: 'Phone Number' }, {id: 'manager_first_name', text: 'Manager First Name' }, {id: 'manager_last_name', text: 'Manager Last Name' }, + {id: 'notes', text: 'Notes' }, {id: 'activated', text: 'Activated' }, {id: 'address', text: 'Address' }, {id: 'city', text: 'City' },