From 079b0d502450025f08ffba2cc719ee3f2f566f12 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Wed, 15 Oct 2025 10:32:16 +0100
Subject: [PATCH] Asset import - allow importing notes

---
 agent/modals/asset/asset_import.php |  2 +-
 agent/post/asset.php                | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/agent/modals/asset/asset_import.php b/agent/modals/asset/asset_import.php
index 764355ae..1218618c 100644
--- a/agent/modals/asset/asset_import.php
+++ b/agent/modals/asset/asset_import.php
@@ -14,7 +14,7 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
                 <div class="modal-body">
-                    <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location</p>
+                    <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
                     <hr>
                     <div class="form-group my-4">
                         <input type="file" class="form-control-file" name="file" accept=".csv" required>
diff --git a/agent/post/asset.php b/agent/post/asset.php
index ca6b15f5..b22c8de5 100644
--- a/agent/post/asset.php
+++ b/agent/post/asset.php
@@ -787,10 +787,10 @@ if (isset($_POST["import_assets_csv"])) {
         flash_alert("Bad file size (empty?)", 'error');
     }
 
-    //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location)
+    //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location, notes)
     $f = fopen($file_name, "r");
     $f_columns = fgetcsv($f, 1000, ",");
-    if (!$error & count($f_columns) != 11) {
+    if (!$error & count($f_columns) != 12) {
         $error = true;
         flash_alert("Invalid column count.", 'error');
     }
@@ -884,10 +884,15 @@ if (isset($_POST["import_assets_csv"])) {
                 $physical_location = sanitizeInput($column[10]);
             }
 
+            // Notes (varchar)
+            if (!empty($column[11])) {
+                $notes = sanitizeInput($column[11]);
+            }
+
             // Check if duplicate was detected
             if ($duplicate_detect == 0) {
                 //Add
-                mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id");
+                mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_notes = '$notes', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id");
 
                 $asset_id = mysqli_insert_id($mysqli);
 
@@ -932,7 +937,7 @@ if (isset($_GET['download_assets_csv_template'])) {
     $f = fopen('php://memory', 'w');
 
     //set column headers
-    $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Purchase Date', 'Assigned To', 'Location', 'Physical Location');
+    $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Purchase Date', 'Assigned To', 'Location', 'Physical Location', 'Notes');
     fputcsv($f, $fields, $delimiter);
 
     //move back to beginning of file