From abb97ad99f010ef69dda4d1d89a898339608f666 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 11 Nov 2025 19:57:51 -0500 Subject: [PATCH] [Feature] Added Asset Tags --- ...ct_templates.php => contract_template.php} | 0 admin/database_updates.php | 31 +- admin/includes/side_nav.php | 2 +- .../contract_template_add.php | 144 ++++++++-- .../contract_template_edit.php | 265 ++++++++++++++++++ admin/modals/tag/tag_add.php | 5 +- admin/modals/tag/tag_edit.php | 3 +- admin/post/contract_template.php | 134 +++++++-- admin/tag.php | 2 + agent/assets.php | 96 ++++++- agent/modals/asset/asset_add.php | 29 ++ agent/modals/asset/asset_bulk_assign_tags.php | 61 ++++ agent/modals/asset/asset_edit.php | 36 ++- agent/post/asset.php | 64 +++++ db.sql | 20 +- includes/database_version.php | 2 +- 16 files changed, 821 insertions(+), 73 deletions(-) rename admin/{contract_templates.php => contract_template.php} (100%) create mode 100644 admin/modals/contract_template/contract_template_edit.php create mode 100644 agent/modals/asset/asset_bulk_assign_tags.php diff --git a/admin/contract_templates.php b/admin/contract_template.php similarity index 100% rename from admin/contract_templates.php rename to admin/contract_template.php diff --git a/admin/database_updates.php b/admin/database_updates.php index f1e138af..ee595709 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -4059,9 +4059,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `contract_template_created_at` DATETIME DEFAULT CURRENT_TIMESTAMP, `contract_template_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, - `contract_template_archived_at` DATETIME NULL DEFAULT NULL, - - `company_id` INT(11) NOT NULL + `contract_template_archived_at` DATETIME NULL DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"); @@ -4115,10 +4113,31 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.7'"); } - // if (CURRENT_DATABASE_VERSION == '2.3.7') { - // // Insert queries here required to update to DB version 2.3.8 + if (CURRENT_DATABASE_VERSION == '2.3.7') { + + mysqli_query($mysqli, " + CREATE TABLE `asset_tags` ( + `asset_tag_asset_id` INT(11) NOT NULL, + `asset_tag_tag_id` INT(11) NOT NULL, + PRIMARY KEY (`asset_tag_asset_id`, `asset_tag_tag_id`), + CONSTRAINT `fk_asset` + FOREIGN KEY (`asset_tag_asset_id`) + REFERENCES `assets`(`asset_id`) + ON DELETE CASCADE, + CONSTRAINT `fk_tag` + FOREIGN KEY (`asset_tag_tag_id`) + REFERENCES `tags`(`tag_id`) + ON DELETE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.3.8') { + // // Insert queries here required to update to DB version 2.3.9 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'"); // } } else { diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php index 230f9fdd..3cbe9ccc 100644 --- a/admin/includes/side_nav.php +++ b/admin/includes/side_nav.php @@ -111,7 +111,7 @@
  • TEMPLATES
  • - +

    Contract Templates

     diff --git a/admin/modals/contract_template/contract_template_add.php b/admin/modals/contract_template/contract_template_add.php index be330d95..ad4c5596 100644 --- a/admin/modals/contract_template/contract_template_add.php +++ b/admin/modals/contract_template/contract_template_add.php @@ -1,15 +1,18 @@
    New Contract Template
    + +
    -
    -
    - +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - - + +
    +
    + +
    + +
    @@ -64,33 +92,63 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    @@ -99,29 +157,49 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    @@ -129,8 +207,12 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
    - - + +
    diff --git a/admin/modals/contract_template/contract_template_edit.php b/admin/modals/contract_template/contract_template_edit.php new file mode 100644 index 00000000..2ce93048 --- /dev/null +++ b/admin/modals/contract_template/contract_template_edit.php @@ -0,0 +1,265 @@ + + +
    +
    Edit Contract Template
    + +
    + + + + +
    + + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    + + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + + +
    +
    + + diff --git a/admin/modals/tag/tag_add.php b/admin/modals/tag/tag_add.php index 9bd6d489..a878cb58 100644 --- a/admin/modals/tag/tag_add.php +++ b/admin/modals/tag/tag_add.php @@ -15,6 +15,8 @@ if (isset($_GET['type'])) { $type_display = "Contact"; } elseif ($type === 4) { $type_display = "Credential"; + } elseif ($type === 5) { + $type_display = "Asset"; } } ob_start(); @@ -58,6 +60,7 @@ ob_start(); + @@ -86,7 +89,7 @@ ob_start();
    - +
    diff --git a/admin/modals/tag/tag_edit.php b/admin/modals/tag/tag_edit.php index 8aa3c2ae..bfd49962 100644 --- a/admin/modals/tag/tag_edit.php +++ b/admin/modals/tag/tag_edit.php @@ -47,6 +47,7 @@ ob_start(); + @@ -73,7 +74,7 @@ ob_start();
    - +
    diff --git a/admin/post/contract_template.php b/admin/post/contract_template.php index 585e3c9e..6e277a3e 100644 --- a/admin/post/contract_template.php +++ b/admin/post/contract_template.php @@ -9,11 +9,12 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); if (isset($_POST['add_contract_template'])) { // Sanitize text inputs - $name = sanitizeInput($_POST['contract_template_name']); - $type = sanitizeInput($_POST['contract_template_type']); - $update_frequency = sanitizeInput($_POST['contract_template_update_frequency']); - $support_hours = sanitizeInput($_POST['contract_template_support_hours']); - $details = mysql_escape_string($mysqli, $_POST['contract_template_details']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $type = sanitizeInput($_POST['type']); + $renewal_frequency = sanitizeInput($_POST['renewal_frequency']); + $support_hours = sanitizeInput($_POST['support_hours']); + $details = mysqli_escape_string($mysqli, $_POST['details']); // Numeric fields cast to integer $sla_low_resp = intval($_POST['sla_low_response_time']); @@ -22,9 +23,9 @@ if (isset($_POST['add_contract_template'])) { $sla_low_res = intval($_POST['sla_low_resolution_time']); $sla_med_res = intval($_POST['sla_medium_resolution_time']); $sla_high_res = intval($_POST['sla_high_resolution_time']); - $hourly_rate = intval($_POST['contract_template_hourly_rate']); - $after_hours_rate = intval($_POST['contract_template_after_hours_hourly_rate']); - $net_terms = intval($_POST['contract_template_net_terms']); + $rate_standard = intval($_POST['rate_standard']); + $rate_after_hours = intval($_POST['hourly_rate_after_hours']); + $net_terms = intval($_POST['net_terms']); // Insert into database (numbers not quoted) mysqli_query($mysqli, " @@ -33,19 +34,17 @@ if (isset($_POST['add_contract_template'])) { contract_template_description = '$description', contract_template_details = '$details', contract_template_type = '$type', - contract_template_update_frequency = '$update_frequency', - sla_low_response_time = $sla_low_resp, - sla_medium_response_time = $sla_med_resp, - sla_high_response_time = $sla_high_resp, - sla_low_resolution_time = $sla_low_res, - sla_medium_resolution_time = $sla_med_res, - sla_high_resolution_time = $sla_high_res, - contract_template_hourly_rate = $hourly_rate, - contract_template_after_hours_hourly_rate = $after_hours_rate, + contract_template_renewal_frequency = '$renewal_frequency', + contract_template_sla_low_response_time = $sla_low_resp, + contract_template_sla_medium_response_time = $sla_med_resp, + contract_template_sla_high_response_time = $sla_high_resp, + contract_template_sla_low_resolution_time = $sla_low_res, + contract_template_sla_medium_resolution_time = $sla_med_res, + contract_template_sla_high_resolution_time = $sla_high_res, + contract_template_rate_standard = $rate_standard, + contract_template_rate_after_hours = $rate_after_hours, contract_template_support_hours = '$support_hours', - contract_template_net_terms = $net_terms, - contract_template_created_by = $session_user_id, - contract_template_created_at = NOW() + contract_template_net_terms = $net_terms "); $contract_template_id = mysqli_insert_id($mysqli); @@ -60,4 +59,99 @@ if (isset($_POST['add_contract_template'])) { redirect(); } +if (isset($_POST['edit_contract_template'])) { + + $contract_template_id = intval($_POST['contract_template_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $type = sanitizeInput($_POST['type']); + $renewal_frequency= sanitizeInput($_POST['renewal_frequency']); + $support_hours = sanitizeInput($_POST['support_hours']); + $details = mysqli_escape_string($mysqli, $_POST['details']); + $sla_low_resp = intval($_POST['sla_low_response_time']); + $sla_med_resp = intval($_POST['sla_medium_response_time']); + $sla_high_resp = intval($_POST['sla_high_response_time']); + $sla_low_res = intval($_POST['sla_low_resolution_time']); + $sla_med_res = intval($_POST['sla_medium_resolution_time']); + $sla_high_res = intval($_POST['sla_high_resolution_time']); + $rate_standard = intval($_POST['rate_standard']); + $rate_after_hours = intval($_POST['rate_after_hours']); + $net_terms = intval($_POST['net_terms']); + + mysqli_query($mysqli, " + UPDATE contract_templates SET + contract_template_name = '$name', + contract_template_description = '$description', + contract_template_details = '$details', + contract_template_type = '$type', + contract_template_renewal_frequency = '$renewal_frequency', + contract_template_sla_low_response_time = $sla_low_resp, + contract_template_sla_medium_response_time = $sla_med_resp, + contract_template_sla_high_response_time = $sla_high_resp, + contract_template_sla_low_resolution_time = $sla_low_res, + contract_template_sla_medium_resolution_time = $sla_med_res, + contract_template_sla_high_resolution_time = $sla_high_res, + contract_template_rate_standard = $rate_standard, + contract_template_rate_after_hours = $rate_after_hours, + contract_template_support_hours = '$support_hours', + contract_template_net_terms = $net_terms + WHERE contract_template_id = $contract_template_id + "); + + // Log action + logAction("Contract Template", "Update", "$session_name updated contract template $name", 0, $contract_template_id); + + // Flash + redirect + flash_alert("Contract Template $name updated"); + redirect(); +} + +if (isset($_GET['archive_contract_template'])) { + $contract_template_id = intval($_GET['archive_contract_template']); + + $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name'); + + mysqli_query($mysqli, " + UPDATE contract_templates SET contract_template_archived_at = NOW() + WHERE contract_template_id = $contract_template_id + LIMIT 1 + "); + + logAction("Contract Template", "Archive", "$session_name archived contract template $name", 0, $contract_template_id); + flash_alert("Contract Template $name archived", "danger"); + redirect(); +} + +if (isset($_GET['restore_contract_template'])) { + $contract_template_id = intval($_GET['restore_contract_template']); + + $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name'); + + mysqli_query($mysqli, " + UPDATE contract_templates SET contract_template_archived_at = NULL + WHERE contract_template_id = $contract_template_id + LIMIT 1 + "); + + logAction("Contract Template", "Restore", "$session_name restored contract template $name", 0, $contract_template_id); + flash_alert("Contract Template $name restored"); + redirect(); +} + +if (isset($_GET['delete_contract_template'])) { + $contract_template_id = intval($_GET['delete_contract_template']); + + $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name'); + + mysqli_query($mysqli, " + DELETE FROM contract_templates + WHERE contract_template_id = $contract_template_id + LIMIT 1 + "); + + logAction("Contract Template", "Delete", "$session_name deleted contract template $name", 0, $contract_template_id); + flash_alert("Contract Template $name deleted", "danger"); + redirect(); +} + ?> diff --git a/admin/tag.php b/admin/tag.php index 33c7d5e9..fe2171fd 100644 --- a/admin/tag.php +++ b/admin/tag.php @@ -74,6 +74,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $tag_type_display = "Contact Tag"; } elseif ( $tag_type == 4) { $tag_type_display = "Credential Tag"; + } elseif ( $tag_type == 5) { + $tag_type_display = "Asset Tag"; } else { $tag_type_display = "Unknown Tag"; } diff --git a/agent/assets.php b/agent/assets.php index c03d4eb4..04c33732 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -78,6 +78,18 @@ if ($client_url && isset($_GET['location']) && !empty($_GET['location'])) { $location_filter = 0; } +// Tags Filter +if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { + // Sanitize each element of the tags array + $sanitizedTags = array_map('intval', $_GET['tags']); + // Convert the sanitized tags into a comma-separated string + $tag_filter = implode(",", $sanitizedTags); + $tag_query = "AND tag_id IN ($tag_filter)"; +} else { + $tag_filter = 0; + $tag_query = ''; +} + //Get Asset Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli, " SELECT @@ -93,9 +105,13 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 + LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id + LEFT JOIN tags ON tag_id = asset_tag_tag_id WHERE $archive_query + $tag_query $access_permission_query $client_query + GROUP BY asset_id ) AS filtered_assets; ")); @@ -127,13 +143,16 @@ $sql = mysqli_query( LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 + LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id + LEFT JOIN tags ON tag_id = asset_tag_tag_id WHERE $archive_query - AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR interface_mac LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%') + $tag_query + AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR interface_mac LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%' OR tag_name LIKE '%$q%') AND ($type_query) $access_permission_query $location_query $client_query - + GROUP BY asset_id ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -270,7 +289,32 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
    +
    +
    + +
    +
    +
    +
    - +
    - +
    -
    -
    +
    +
    + +
    + +
    +
    diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php index 0b6ebccf..cda60a46 100644 --- a/agent/modals/asset/asset_add.php +++ b/agent/modals/asset/asset_add.php @@ -27,6 +27,8 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) { $json_os = json_encode($os_arr); } +$sql_tags_select = mysqli_query($mysqli, "SELECT tag_id, tag_name FROM tags WHERE tag_type = 5 ORDER BY tag_name ASC"); + ob_start(); ?> @@ -465,6 +467,33 @@ ob_start();
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    diff --git a/agent/modals/asset/asset_bulk_assign_tags.php b/agent/modals/asset/asset_bulk_assign_tags.php new file mode 100644 index 00000000..e5bd8341 --- /dev/null +++ b/agent/modals/asset/asset_bulk_assign_tags.php @@ -0,0 +1,61 @@ + + +
    +
    Assign Tags for Assets
    + +
    +
    + + + +
    + + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    + + @@ -462,6 +469,33 @@ ob_start(); +
    + +
    +
    + +
    + +
    + +
    +
    +
    +

    Asset ID:

    diff --git a/agent/post/asset.php b/agent/post/asset.php index b22c8de5..8c1d22a6 100644 --- a/agent/post/asset.php +++ b/agent/post/asset.php @@ -20,6 +20,14 @@ if (isset($_POST['add_asset'])) { $asset_id = mysqli_insert_id($mysqli); + // Add Tags + if (isset($_POST['tags'])) { + foreach($_POST['tags'] as $tag) { + $tag = intval($tag); + mysqli_query($mysqli, "INSERT INTO asset_tags SET asset_tag_asset_id = $asset_id, asset_tag_tag_id = $tag"); + } + } + // Add Photo if (isset($_FILES['file']['tmp_name'])) { if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) { @@ -108,6 +116,18 @@ if (isset($_POST['edit_asset'])) { mysqli_query($mysqli,"UPDATE assets SET asset_photo = '$new_file_name' WHERE asset_id = $asset_id"); } + // Tags + // Delete existing tags + mysqli_query($mysqli, "DELETE FROM asset_tags WHERE asset_tag_asset_id = $asset_id"); + + // Add new tags + if (isset($_POST['tags'])) { + foreach($_POST['tags'] as $tag) { + $tag = intval($tag); + mysqli_query($mysqli, "INSERT INTO asset_tags SET asset_tag_asset_id = $asset_id, asset_tag_tag_id = $tag"); + } + } + logAction("Asset", "Edit", "$session_name edited asset $name", $client_id, $asset_id); flash_alert("Asset $name edited"); @@ -188,6 +208,50 @@ if (isset($_GET['delete_asset'])) { } +if (isset($_POST['bulk_assign_asset_tags'])) { + + enforceUserPermission('module_client', 2); + + if (isset($_POST['asset_ids'])) { + + $count = count($_POST['asset_ids']); + + foreach($_POST['asset_ids'] as $asset_id) { + $asset_id = intval($asset_id); + + $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); + $row = mysqli_fetch_array($sql); + $asset_name = sanitizeInput($row['asset_name']); + $client_id = intval($row['asset_client_id']); + + if($_POST['remove_tags']) { + mysqli_query($mysqli, "DELETE FROM asset_tags WHERE asset_tag_asset_id = $asset_id"); + } + + if (isset($_POST['tags'])) { + foreach($_POST['tags'] as $tag) { + $tag = intval($tag); + + $sql = mysqli_query($mysqli,"SELECT * FROM asset_tags WHERE asset_tag_asset_id = $asset_id AND asset_tag_tag_id = $tag"); + if (mysqli_num_rows($sql) == 0) { + mysqli_query($mysqli, "INSERT INTO asset_tags SET asset_tag_asset_id = $asset_id, asset_tag_tag_id = $tag"); + } + } + } + + logAction("Asset", "Edit", "$session_name added tags to asset $asset_name", $client_id, $asset_id); + + } + + logAction("Asset", "Bulk Edit", "$session_name added tags for $asset_count assets", $client_id); + + flash_alert("Assigned tags for $count assets"); + } + + redirect(); + +} + if (isset($_POST['bulk_assign_asset_location'])) { validateCSRFToken($_POST['csrf_token']); diff --git a/db.sql b/db.sql index 6a1fddf5..42af2911 100644 --- a/db.sql +++ b/db.sql @@ -275,6 +275,23 @@ CREATE TABLE `asset_notes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `asset_tags` +-- + +DROP TABLE IF EXISTS `asset_tags`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `asset_tags` ( + `asset_tag_asset_id` int(11) NOT NULL, + `asset_tag_tag_id` int(11) NOT NULL, + PRIMARY KEY (`asset_tag_asset_id`,`asset_tag_tag_id`), + KEY `fk_tag` (`asset_tag_tag_id`), + CONSTRAINT `fk_asset` FOREIGN KEY (`asset_tag_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `fk_tag` FOREIGN KEY (`asset_tag_tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `assets` -- @@ -800,7 +817,6 @@ CREATE TABLE `contract_templates` ( `contract_template_created_at` datetime DEFAULT current_timestamp(), `contract_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `contract_template_archived_at` datetime DEFAULT NULL, - `company_id` int(11) NOT NULL, PRIMARY KEY (`contract_template_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2897,4 +2913,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-11-07 16:47:40 +-- Dump completed on 2025-11-11 19:57:21 diff --git a/includes/database_version.php b/includes/database_version.php index 550ddbd1..63110ccf 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.3.7"); +DEFINE("LATEST_DATABASE_VERSION", "2.3.8");