From 3d3492ef278d3409571e0d4c043d96c4a378f0fe Mon Sep 17 00:00:00 2001 From: wrongecho Date: Sat, 10 Aug 2024 20:46:59 +0100 Subject: [PATCH 1/2] Add move/transfer assets Add ability to move / transfer assets between clients. Moving an asset involves the asset being archived and then re-created under the new client with most of the same information. Information about the old & new asset is stored in the audit logs and within the asset notes. Information from the audit logs is accessible via a new History tab on the asset, subject to audit log retention. --- client_asset_edit_modal.php | 29 ++++++++++++++++++++ client_asset_transfer_modal.php | 46 ++++++++++++++++++++++++++++++++ client_assets.php | 4 +++ post/asset.php | 47 +++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 client_asset_transfer_modal.php diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php index 76060328..063a6f78 100644 --- a/client_asset_edit_modal.php +++ b/client_asset_edit_modal.php @@ -29,6 +29,9 @@
  • Notes
    • +
  • + History +
    • @@ -386,6 +389,32 @@ + +
    + + + +
    + + +
      + + $log_created_at - $log_action: $log_description"; + } + ?> +
    + +
    + + + +
    +
    diff --git a/client_asset_transfer_modal.php b/client_asset_transfer_modal.php new file mode 100644 index 00000000..682595ff --- /dev/null +++ b/client_asset_transfer_modal.php @@ -0,0 +1,46 @@ + \ No newline at end of file diff --git a/client_assets.php b/client_assets.php index 694d0c2e..59fe9d42 100644 --- a/client_assets.php +++ b/client_assets.php @@ -466,6 +466,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Unarchive + + Transfer + Archive @@ -489,6 +492,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require "client_asset_copy_modal.php"; + require "client_asset_transfer_modal.php"; } diff --git a/post/asset.php b/post/asset.php index 65639ad3..20f00280 100644 --- a/post/asset.php +++ b/post/asset.php @@ -195,6 +195,53 @@ if (isset($_POST['edit_asset'])) { } +if (isset($_POST['change_client_asset'])) { + + validateTechRole(); + + $current_asset_id = intval($_POST['current_asset_id']); + $new_client_id = intval($_POST['new_client_id']); + + // Get Asset details and current client ID/Name for logging + $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT asset_name, asset_notes, asset_client_id, client_name FROM assets LEFT JOIN clients ON client_id = asset_client_id WHERE asset_id = $current_asset_id")); + $asset_name = sanitizeInput($row['asset_name']); + $asset_notes = sanitizeInput($row['asset_notes']); + $current_client_id = intval($row['asset_client_id']); + $current_client_name = sanitizeInput($row['client_name']); + + // Get new client name for logging + $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $new_client_id")); + $new_client_name = sanitizeInput($row['client_name']); + + // Create new asset + mysqli_query($mysqli, " + INSERT INTO assets (asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important) + SELECT asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important + FROM assets + WHERE asset_id = $current_asset_id + "); + $new_asset_id = mysqli_insert_id($mysqli); + mysqli_query($mysqli, "UPDATE assets SET asset_client_id = $new_client_id WHERE asset_id = $new_asset_id"); + + // Archive/log the current asset + $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; + mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NOW() WHERE asset_id = $current_asset_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Archive', log_description = '$session_name archived asset $asset_name (via transfer)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $current_client_id, log_user_id = $session_user_id, log_entity_id = $current_asset_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Transfer', log_description = 'Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $current_client_id, log_user_id = $session_user_id, log_entity_id = $current_asset_id"); + mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $current_asset_id"); + + // Log the new asset + $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Create', log_description = '$session_name created asset $name (via transfer)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $new_client_id, log_user_id = $session_user_id, log_entity_id = $new_asset_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Transfer', log_description = 'Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $new_client_id, log_user_id = $session_user_id, log_entity_id = $new_asset_id"); + mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $new_asset_id"); + + $_SESSION['alert_message'] = "Asset $name transferred"; + + header("Location: client_assets.php?client_id=$new_client_id&asset_id=$new_asset_id"); + +} + if (isset($_GET['archive_asset'])) { validateTechRole(); From 8fb50275ac2cfcb928d4a115d49e26bcea801e01 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Sat, 10 Aug 2024 20:51:57 +0100 Subject: [PATCH 2/2] Add move/transfer assets Add ability to move / transfer assets between clients. Moving an asset involves the asset being archived and then re-created under the new client with most of the same information. Information about the old & new asset is stored in the audit logs and within the asset notes. Information from the audit logs is accessible via a new History tab on the asset, subject to audit log retention. --- client_asset_transfer_modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_asset_transfer_modal.php b/client_asset_transfer_modal.php index 682595ff..c52f52eb 100644 --- a/client_asset_transfer_modal.php +++ b/client_asset_transfer_modal.php @@ -43,4 +43,4 @@
    - \ No newline at end of file +