diff --git a/admin_settings_online_payment.php b/admin_settings_online_payment.php index b8aa5a4e..ac288b79 100644 --- a/admin_settings_online_payment.php +++ b/admin_settings_online_payment.php @@ -76,7 +76,7 @@ require_once "includes/inc_all_admin.php"; "> - - Template + + Template - - Type + + Type - - License Type + + License Type Action @@ -74,41 +69,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
-
$software_version"; ?>
-
+
$software_template_version"; ?>
+
- - + +
- + Edit
- + Delete diff --git a/admin_vendor_template.php b/admin_vendor_template.php index 0eef37a8..b6831124 100644 --- a/admin_vendor_template.php +++ b/admin_vendor_template.php @@ -1,20 +1,15 @@ "> - - Vendor + + Vendor - - Description + + Description Contact @@ -70,30 +65,29 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -101,38 +95,38 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
- + - + - +
- + if (!empty($vendor_template_phone)) { ?> +
- + if (!empty($vendor_template_email)) { ?> +
@@ -146,13 +140,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Edit
- + Delete diff --git a/ajax/ajax_asset_copy.php b/ajax/ajax_asset_copy.php index a491fb4d..3a47c387 100644 --- a/ajax/ajax_asset_copy.php +++ b/ajax/ajax_asset_copy.php @@ -341,7 +341,7 @@ ob_start(); '$expense_created_at' OR vendor_archived_at IS NULL) ORDER BY vendor_name ASC"); + $sql_select = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) ORDER BY vendor_name ASC"); while ($row = mysqli_fetch_array($sql_select)) { $vendor_id_select = intval($row['vendor_id']); $vendor_name_select = nullable_htmlentities($row['vendor_name']); diff --git a/ajax/ajax_recurring_expense_edit.php b/ajax/ajax_recurring_expense_edit.php index 3b857d01..34a7c55e 100644 --- a/ajax/ajax_recurring_expense_edit.php +++ b/ajax/ajax_recurring_expense_edit.php @@ -157,7 +157,7 @@ ob_start(); +
diff --git a/ajax/ajax_ticket_edit.php b/ajax/ajax_ticket_edit.php index a52816c4..5a27209c 100644 --- a/ajax/ajax_ticket_edit.php +++ b/ajax/ajax_ticket_edit.php @@ -328,7 +328,7 @@ ob_start(); - None - + $vendor_template_id_select = $row['vendor_template_id']; + $vendor_template_name_select = nullable_htmlentities($row['vendor_template_name']); ?> diff --git a/ajax/ajax_vendor_template_edit.php b/ajax/ajax_vendor_template_edit.php index f31897b1..23865fcd 100644 --- a/ajax/ajax_vendor_template_edit.php +++ b/ajax/ajax_vendor_template_edit.php @@ -2,23 +2,22 @@ require_once '../includes/ajax_header.php'; -$vendor_id = intval($_GET['id']); +$vendor_template_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_id = $vendor_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM vendor_templates WHERE vendor_template_id = $vendor_template_id LIMIT 1"); $row = mysqli_fetch_array($sql); -$vendor_name = nullable_htmlentities($row['vendor_name']); -$vendor_description = nullable_htmlentities($row['vendor_description']); -$vendor_account_number = nullable_htmlentities($row['vendor_account_number']); -$vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); -$vendor_phone = formatPhoneNumber($row['vendor_phone']); -$vendor_extension = nullable_htmlentities($row['vendor_extension']); -$vendor_email = nullable_htmlentities($row['vendor_email']); -$vendor_website = nullable_htmlentities($row['vendor_website']); -$vendor_hours = nullable_htmlentities($row['vendor_hours']); -$vendor_sla = nullable_htmlentities($row['vendor_sla']); -$vendor_code = nullable_htmlentities($row['vendor_code']); -$vendor_notes = nullable_htmlentities($row['vendor_notes']); -$vendor_template = intval($row['vendor_template']); +$vendor_name = nullable_htmlentities($row['vendor_template_name']); +$vendor_description = nullable_htmlentities($row['vendor_template_description']); +$vendor_account_number = nullable_htmlentities($row['vendor_template_account_number']); +$vendor_contact_name = nullable_htmlentities($row['vendor_template_contact_name']); +$vendor_phone = formatPhoneNumber($row['vendor_template_phone']); +$vendor_extension = nullable_htmlentities($row['vendor_template_extension']); +$vendor_email = nullable_htmlentities($row['vendor_template_email']); +$vendor_website = nullable_htmlentities($row['vendor_template_website']); +$vendor_hours = nullable_htmlentities($row['vendor_template_hours']); +$vendor_sla = nullable_htmlentities($row['vendor_template_sla']); +$vendor_code = nullable_htmlentities($row['vendor_template_code']); +$vendor_notes = nullable_htmlentities($row['vendor_template_notes']); // Generate the HTML form content using output buffering. ob_start(); @@ -31,18 +30,18 @@ ob_start();
- +
@@ -52,7 +51,7 @@ ob_start();
-
+
@@ -117,14 +116,14 @@ ob_start();
- - + +
-
+
@@ -225,7 +224,7 @@ ob_start();
-
+
diff --git a/api/v1/documents/create.php b/api/v1/documents/create.php index 82d9f7e5..b396ce87 100644 --- a/api/v1/documents/create.php +++ b/api/v1/documents/create.php @@ -13,15 +13,12 @@ $insert_id = false; if (!empty($name) && !(empty($content))) { // Create document - $insert_sql = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_created_by = 0, document_client_id = $client_id"); + $insert_sql = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_folder_id = $folder, document_created_by = 0, document_client_id = $client_id"); // Check insert & get insert ID if ($insert_sql) { $insert_id = mysqli_insert_id($mysqli); - // Update field document_parent to be the same id as document ID as this is the only version of the document. - mysqli_query($mysqli,"UPDATE documents SET document_parent = $insert_id WHERE document_id = $insert_id"); - // Logging logAction("Document", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); logAction("API", "Success", "Created document $name via API ($api_key_name)", $client_id); diff --git a/api/v1/documents/update.php b/api/v1/documents/update.php index 63bd9939..9ff03ca6 100644 --- a/api/v1/documents/update.php +++ b/api/v1/documents/update.php @@ -18,34 +18,12 @@ if (!empty($document_id)) { require_once 'document_model.php'; // Documents are a little weird as we update them by *inserting* a new document row - $update_insert_sql = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_created_by = 0, document_client_id = $client_id"); + $update_insert_sql = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_folder_id = $folder, document_created_by = 0, document_client_id = $client_id"); // Check insert & get insert ID if ($update_insert_sql) { $insert_id = $new_document_id = mysqli_insert_id($mysqli); - // Update the parent ID of the new document to match its new document ID - mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id WHERE document_id = $new_document_id"); - - // Link all existing links with old document with new document - mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id, document_archived_at = NOW() WHERE document_parent = $document_id"); - - // Update Links to the new parent document:- - // Document files - mysqli_query($mysqli,"UPDATE document_files SET document_id = $new_document_id WHERE document_id = $document_id"); - - // Contact documents - mysqli_query($mysqli,"UPDATE contact_documents SET document_id = $new_document_id WHERE document_id = $document_id"); - - // Asset documents - mysqli_query($mysqli,"UPDATE asset_documents SET document_id = $new_document_id WHERE document_id = $document_id"); - - // Software documents - mysqli_query($mysqli,"UPDATE software_documents SET document_id = $new_document_id WHERE document_id = $document_id"); - - // Vendor documents - mysqli_query($mysqli,"UPDATE vendor_documents SET document_id = $new_document_id WHERE document_id = $document_id"); - // Logging logAction("Document", "Edit", "$name via API ($api_key_name) previous version kept", $client_id, $insert_id); logAction("API", "Success", "Edited document $name via API ($api_key_name)", $client_id); diff --git a/calendar.php b/calendar.php index 128cebe0..64f1ac95 100644 --- a/calendar.php +++ b/calendar.php @@ -303,7 +303,7 @@ while ($row = mysqli_fetch_array($sql)) { } //Vendors Added Created - $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id $client_query AND vendor_template = 0 "); + $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id $client_query"); while ($row = mysqli_fetch_array($sql)) { $event_id = intval($row['vendor_id']); $client_id = intval($row['client_id']); diff --git a/dashboard.php b/dashboard.php index 0cbab4ba..d14ebe03 100644 --- a/dashboard.php +++ b/dashboard.php @@ -158,7 +158,7 @@ if ($user_config_dashboard_financial_enable == 1) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(client_id) AS clients_added FROM clients WHERE YEAR(client_created_at) = $year AND client_archived_at IS NULL")); $clients_added = intval($row['clients_added']); - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(vendor_id) AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(vendor_id) AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_archived_at IS NULL")); $vendors_added = intval($row['vendors_added']); ?>
diff --git a/database_updates.php b/database_updates.php index 6da12e04..b977899d 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3545,10 +3545,135 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.7'"); } - // if (CURRENT_DATABASE_VERSION == '2.1.7') { - // // Insert queries here required to update to DB version 2.1.8 + if (CURRENT_DATABASE_VERSION == '2.1.7') { + mysqli_query($mysqli, "CREATE TABLE `software_templates` ( + `software_template_id` INT(11) NOT NULL AUTO_INCREMENT, + `software_template_name` VARCHAR(200) NOT NULL, + `software_template_description` TEXT DEFAULT NULL, + `software_template_version` VARCHAR(200) DEFAULT NULL, + `software_template_type` VARCHAR(200) NOT NULL, + `software_template_license_type` VARCHAR(200) DEFAULT NULL, + `software_template_notes` TEXT DEFAULT NULL, + `software_template_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `software_template_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `software_template_archived_at` DATETIME NULL DEFAULT NULL, + PRIMARY KEY (`software_template_id`) + )"); + + // Copy software Templates over to new software templates table + mysqli_query($mysqli, " + INSERT INTO software_templates ( + software_template_name, + software_template_description, + software_template_version, + software_template_type, + software_template_license_type, + software_template_notes, + software_template_created_at, + software_template_updated_at, + software_template_archived_at + ) + SELECT + software_name, + software_description, + software_version, + software_type, + software_license_type, + software_notes, + software_created_at, + software_updated_at, + software_archived_at + FROM + software + WHERE + software_template = 1 + "); + + mysqli_query($mysqli, "DELETE FROM software WHERE software_template = 1"); + + mysqli_query($mysqli, "ALTER TABLE `software` DROP `software_template`"); + + mysqli_query($mysqli, "ALTER TABLE `software` DROP `software_template_id`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.8'"); + } + + if (CURRENT_DATABASE_VERSION == '2.1.8') { + mysqli_query($mysqli, "CREATE TABLE `vendor_templates` ( + `vendor_template_id` INT(11) NOT NULL AUTO_INCREMENT, + `vendor_template_name` VARCHAR(200) NOT NULL, + `vendor_template_description` VARCHAR(200) DEFAULT NULL, + `vendor_template_contact_name` VARCHAR(200) DEFAULT NULL, + `vendor_template_phone_country_code` VARCHAR(10) DEFAULT NULL, + `vendor_template_phone` VARCHAR(200) DEFAULT NULL, + `vendor_template_extension` VARCHAR(200) DEFAULT NULL, + `vendor_template_email` VARCHAR(200) DEFAULT NULL, + `vendor_template_website` VARCHAR(200) DEFAULT NULL, + `vendor_template_hours` VARCHAR(200) DEFAULT NULL, + `vendor_template_sla` VARCHAR(200) DEFAULT NULL, + `vendor_template_code` VARCHAR(200) DEFAULT NULL, + `vendor_template_account_number` VARCHAR(200) DEFAULT NULL, + `vendor_template_notes` TEXT DEFAULT NULL, + `vendor_template_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `vendor_template_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `vendor_template_archived_at` DATETIME NULL DEFAULT NULL, + PRIMARY KEY (`vendor_template_id`) + )"); + + // Copy Vendor Templates over to new vendor templates table + mysqli_query($mysqli, " + INSERT INTO vendor_templates ( + vendor_template_name, + vendor_template_description, + vendor_template_contact_name, + vendor_template_phone_country_code, + vendor_template_phone, + vendor_template_extension, + vendor_template_email, + vendor_template_website, + vendor_template_hours, + vendor_template_sla, + vendor_template_code, + vendor_template_account_number, + vendor_template_notes, + vendor_template_created_at, + vendor_template_updated_at, + vendor_template_archived_at + ) + SELECT + vendor_name, + vendor_description, + vendor_contact_name, + vendor_phone_country_code, + vendor_phone, + vendor_extension, + vendor_email, + vendor_website, + vendor_hours, + vendor_sla, + vendor_code, + vendor_account_number, + vendor_notes, + vendor_created_at, + vendor_updated_at, + vendor_archived_at + FROM + vendors + WHERE + vendor_template = 1 + "); + + mysqli_query($mysqli, "DELETE FROM vendors WHERE vendor_template = 1"); + + mysqli_query($mysqli, "ALTER TABLE `vendors` DROP `vendor_template`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.1.9') { + // // Insert queries here required to update to DB version 2.2.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.8'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.0'"); // } } else { diff --git a/db.sql b/db.sql index 36c642bc..cad2d325 100644 --- a/db.sql +++ b/db.sql @@ -1941,14 +1941,12 @@ CREATE TABLE `software` ( `software_purchase` date DEFAULT NULL, `software_expire` date DEFAULT NULL, `software_notes` text DEFAULT NULL, - `software_template` tinyint(1) NOT NULL DEFAULT 0, `software_created_at` datetime NOT NULL DEFAULT current_timestamp(), `software_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `software_archived_at` datetime DEFAULT NULL, `software_accessed_at` datetime DEFAULT NULL, `software_vendor_id` int(11) DEFAULT 0, `software_client_id` int(11) NOT NULL, - `software_template_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`software_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2038,6 +2036,28 @@ CREATE TABLE `software_files` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `software_templates` +-- + +DROP TABLE IF EXISTS `software_templates`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `software_templates` ( + `software_template_id` int(11) NOT NULL AUTO_INCREMENT, + `software_template_name` varchar(200) NOT NULL, + `software_template_description` text DEFAULT NULL, + `software_template_version` varchar(200) DEFAULT NULL, + `software_template_type` varchar(200) NOT NULL, + `software_template_license_type` varchar(200) DEFAULT NULL, + `software_template_notes` text DEFAULT NULL, + `software_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `software_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `software_template_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`software_template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `tags` -- @@ -2500,6 +2520,35 @@ CREATE TABLE `vendor_files` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `vendor_templates` +-- + +DROP TABLE IF EXISTS `vendor_templates`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `vendor_templates` ( + `vendor_template_id` int(11) NOT NULL AUTO_INCREMENT, + `vendor_template_name` varchar(200) NOT NULL, + `vendor_template_description` varchar(200) DEFAULT NULL, + `vendor_template_contact_name` varchar(200) DEFAULT NULL, + `vendor_template_phone_country_code` varchar(10) DEFAULT NULL, + `vendor_template_phone` varchar(200) DEFAULT NULL, + `vendor_template_extension` varchar(200) DEFAULT NULL, + `vendor_template_email` varchar(200) DEFAULT NULL, + `vendor_template_website` varchar(200) DEFAULT NULL, + `vendor_template_hours` varchar(200) DEFAULT NULL, + `vendor_template_sla` varchar(200) DEFAULT NULL, + `vendor_template_code` varchar(200) DEFAULT NULL, + `vendor_template_account_number` varchar(200) DEFAULT NULL, + `vendor_template_notes` text DEFAULT NULL, + `vendor_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `vendor_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `vendor_template_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`vendor_template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `vendors` -- @@ -2522,7 +2571,6 @@ CREATE TABLE `vendors` ( `vendor_code` varchar(200) DEFAULT NULL, `vendor_account_number` varchar(200) DEFAULT NULL, `vendor_notes` text DEFAULT NULL, - `vendor_template` tinyint(1) NOT NULL DEFAULT 0, `vendor_created_at` datetime NOT NULL DEFAULT current_timestamp(), `vendor_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `vendor_archived_at` datetime DEFAULT NULL, @@ -2542,4 +2590,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-06-17 19:00:19 +-- Dump completed on 2025-06-17 22:44:10 diff --git a/expenses.php b/expenses.php index 9e1da9ec..d9641f9c 100644 --- a/expenses.php +++ b/expenses.php @@ -154,7 +154,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Copy
- - Select Vendor - - Vendor - - All Vendors - - Vendor - Select related vendors