From 75e002a054d5685d63070ab7a82e75f452c6a523 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 3 Feb 2025 22:18:22 +0000 Subject: [PATCH 1/8] Update git-ignore for new quotes dir --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c70c3cf8..ada890d7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ uploads/tmp/* !uploads/tmp/index.php uploads/tickets/* !uploads/tickets/index.php +uploads/quotes/* +!uploads/quotes/index.php .idea/* plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/* !plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/.gitkeep From b50c2295a6df4a3a8c1153aadb82411d759f7034 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 3 Feb 2025 22:19:06 +0000 Subject: [PATCH 2/8] Add logic for showing quote attachments in the admin/tech side --- quote.php | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/quote.php b/quote.php index 816ea672..7b34f0db 100644 --- a/quote.php +++ b/quote.php @@ -108,6 +108,13 @@ if (isset($_GET['quote_id'])) { $json_products = json_encode($products); } + // Attachments + // Get Ticket Attachments + $sql_quote_attachments = mysqli_query( + $mysqli, + "SELECT * FROM quote_attachments WHERE quote_attachments.quote_attachment_quote_id = $quote_id" + ); + ?>
    @@ -483,6 +490,54 @@ if (isset($_GET['quote_id'])) { + 0) { ?> +
    +
    +
    +
    + Attachments +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + +
    File NameUpload date
    +
    +
    +
    +
    + +
    From 04226101af68a5a2e49755bfc4e93dc513dc09c9 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 3 Feb 2025 22:19:32 +0000 Subject: [PATCH 3/8] Add ability for client to upload attachments to approved invoices --- guest/guest_post.php | 82 ++++++++++++++++++++++--- guest/guest_quote_upload_file_modal.php | 37 +++++++++++ guest/guest_view_quote.php | 9 ++- uploads/quotes/index.php | 1 + 4 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 guest/guest_quote_upload_file_modal.php create mode 100644 uploads/quotes/index.php diff --git a/guest/guest_post.php b/guest/guest_post.php index 97a33505..db202764 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -50,13 +50,13 @@ if (isset($_GET['accept_quote'], $_GET['url_key'])) { $subject = "Quote Accepted - $client_name - Quote $quote_prefix$quote_number"; $body = "Hello,

    This is a notification that a quote has been accepted in ITFlow.

    Client: $client_name
    Quote: $quote_prefix$quote_number

    ~
    $company_name - Billing
    $config_quote_from_email"; - $data[] = [ - 'from' => $config_quote_from_email, - 'from_name' => $config_quote_from_name, - 'recipient' => $config_quote_notification_email, - 'subject' => $subject, - 'body' => $body, - ]; + $data[] = [ + 'from' => $config_quote_from_email, + 'from_name' => $config_quote_from_name, + 'recipient' => $config_quote_notification_email, + 'subject' => $subject, + 'body' => $body, + ]; $mail = addToMailQueue($data); } @@ -200,4 +200,72 @@ if (isset($_GET['add_ticket_feedback'], $_GET['url_key'])) { echo "Invalid!!"; } } + +if (isset($_POST['guest_quote_upload_file'])) { + $quote_id = intval($_POST['quote_id']); + $url_key = sanitizeInput($_POST['url_key']); + + // Select only the necessary fields + $sql = mysqli_query($mysqli, "SELECT quote_prefix, quote_number, client_id FROM quotes LEFT JOIN clients ON quote_client_id = client_id WHERE quote_id = $quote_id AND quote_url_key = '$url_key'"); + + if (mysqli_num_rows($sql) == 1) { + $row = mysqli_fetch_array($sql); + $quote_prefix = sanitizeInput($row['quote_prefix']); + $quote_number = intval($row['quote_number']); + $client_id = intval($row['client_id']); + + // Define & create directories, as required + mkdirMissing('../uploads/quotes/'); + $upload_file_dir = "../uploads/quotes/" . $quote_id . "/"; + mkdirMissing($upload_file_dir); + + // Store attached any file + if (!empty($_FILES)) { + + for ($i = 0; $i < count($_FILES['file']['name']); $i++) { + // Extract file details for this iteration + $single_file = [ + 'name' => $_FILES['file']['name'][$i], + 'type' => $_FILES['file']['type'][$i], + 'tmp_name' => $_FILES['file']['tmp_name'][$i], + 'error' => $_FILES['file']['error'][$i], + 'size' => $_FILES['file']['size'][$i] + ]; + + if ($file_reference_name = checkFileUpload($single_file, array('pdf'))) { + + $file_tmp_path = $_FILES['file']['tmp_name'][$i]; + + $file_name = sanitizeInput($_FILES['file']['name'][$i]); + $extarr = explode('.', $_FILES['file']['name'][$i]); + $file_extension = sanitizeInput(strtolower(end($extarr))); + + // Define destination file path + $dest_path = $upload_file_dir . $file_reference_name; + + // Do upload + move_uploaded_file($file_tmp_path, $dest_path); + mysqli_query($mysqli, "INSERT INTO quote_attachments SET quote_attachment_name = '$file_name', quote_attachment_reference_name = '$file_reference_name', quote_attachment_quote_id = $quote_id"); + + // Logging & feedback + $_SESSION['alert_message'] = 'File uploaded!'; + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Upload', history_description = 'Client uploaded file $file_name', history_quote_id = $quote_id"); + logAction("File", "Upload", "Guest uploaded file $file_name to quote $quote_prefix$quote_number", $client_id); + + } else { + $_SESSION['alert_type'] = 'error'; + $_SESSION['alert_message'] = 'Something went wrong uploading the file - please let the support team know.'; + + } + + } + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + + } else { + echo "Invalid!!"; + } +} + ?> diff --git a/guest/guest_quote_upload_file_modal.php b/guest/guest_quote_upload_file_modal.php new file mode 100644 index 00000000..c57eae06 --- /dev/null +++ b/guest/guest_quote_upload_file_modal.php @@ -0,0 +1,37 @@ + diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php index 56f584f6..0baabd22 100644 --- a/guest/guest_view_quote.php +++ b/guest/guest_view_quote.php @@ -270,8 +270,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
    strtotime("now")) { - ?> + if ($quote_status == "Sent" || $quote_status == "Viewed" && strtotime($quote_expire) > strtotime("now")) { ?> Accept @@ -279,6 +278,11 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie Decline + + +
    @@ -712,5 +716,6 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie Date: Mon, 3 Feb 2025 22:32:25 +0000 Subject: [PATCH 4/8] rm desc field; we don't store the description, the file name is enough because we know it's already related to the quote --- guest/guest_quote_upload_file_modal.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/guest/guest_quote_upload_file_modal.php b/guest/guest_quote_upload_file_modal.php index c57eae06..ba861230 100644 --- a/guest/guest_quote_upload_file_modal.php +++ b/guest/guest_quote_upload_file_modal.php @@ -12,16 +12,6 @@
    -
    - -
    -
    - -
    - -
    -
    -
    From 55c761b11e026aecfadae04b37898263da75922c Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 5 Feb 2025 15:44:09 +0000 Subject: [PATCH 5/8] rv --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index ada890d7..c70c3cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,6 @@ uploads/tmp/* !uploads/tmp/index.php uploads/tickets/* !uploads/tickets/index.php -uploads/quotes/* -!uploads/quotes/index.php .idea/* plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/* !plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/.gitkeep From c36fb6ae1200168867d430cd77fd35b082219e50 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 5 Feb 2025 15:44:33 +0000 Subject: [PATCH 6/8] rv --- uploads/quotes/index.php | 1 - 1 file changed, 1 deletion(-) delete mode 100644 uploads/quotes/index.php diff --git a/uploads/quotes/index.php b/uploads/quotes/index.php deleted file mode 100644 index 8b137891..00000000 --- a/uploads/quotes/index.php +++ /dev/null @@ -1 +0,0 @@ - From 2fe7bf68709c1a24db840301faa17af628108015 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 5 Feb 2025 22:48:15 +0000 Subject: [PATCH 7/8] Taking a different approach. Utilize the existing file upload functionality and just link the file to the quote. --- guest/guest_post.php | 33 ++++++++++++++++++++++++++++----- post/user/file.php | 2 ++ quote.php | 19 +++++++++---------- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/guest/guest_post.php b/guest/guest_post.php index db202764..cfc8af51 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -215,8 +215,7 @@ if (isset($_POST['guest_quote_upload_file'])) { $client_id = intval($row['client_id']); // Define & create directories, as required - mkdirMissing('../uploads/quotes/'); - $upload_file_dir = "../uploads/quotes/" . $quote_id . "/"; + $upload_file_dir = "../uploads/clients/$client_id/"; mkdirMissing($upload_file_dir); // Store attached any file @@ -240,22 +239,46 @@ if (isset($_POST['guest_quote_upload_file'])) { $extarr = explode('.', $_FILES['file']['name'][$i]); $file_extension = sanitizeInput(strtolower(end($extarr))); + // Extract the file mime type and size + $file_mime_type = sanitizeInput($single_file['type']); + $file_size = intval($single_file['size']); + // Define destination file path $dest_path = $upload_file_dir . $file_reference_name; - // Do upload + // Get/Create a top-level folder called Client Uploads + $folder_sql = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_name = 'Client Uploads' AND parent_folder = 0 AND folder_client_id = $client_id LIMIT 1"); + if (mysqli_num_rows($folder_sql) == 1) { + // Get + $row = mysqli_fetch_array($folder_sql); + $folder_id = $row['folder_id']; + } else { + // Create + mysqli_query($mysqli,"INSERT INTO folders SET folder_name = 'Client Uploads', parent_folder = 0, folder_location = 1, folder_client_id = $client_id"); + $folder_id = mysqli_insert_id($mysqli); + logAction("Folder", "Create", "Automatically created folder Client Uploads", $client_id, $folder_id); + } + + // Do move/upload move_uploaded_file($file_tmp_path, $dest_path); - mysqli_query($mysqli, "INSERT INTO quote_attachments SET quote_attachment_name = '$file_name', quote_attachment_reference_name = '$file_reference_name', quote_attachment_quote_id = $quote_id"); + + // Create reference in files + mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_description = 'Uploaded via $quote_prefix$quote_number', file_ext = '$file_extension', file_mime_type = '$file_mime_type', file_size = $file_size, file_folder_id = $folder_id, file_client_id = $client_id"); + $file_id = mysqli_insert_id($mysqli); + + // Associate file with quote + mysqli_query($mysqli, "INSERT INTO quote_files SET quote_id = $quote_id, file_id = $file_id"); // Logging & feedback $_SESSION['alert_message'] = 'File uploaded!'; + appNotify("Quote File", "$file_name was uploaded to quote $quote_prefix$quote_number", "quote.php?quote_id=$quote_id", $client_id); mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Upload', history_description = 'Client uploaded file $file_name', history_quote_id = $quote_id"); logAction("File", "Upload", "Guest uploaded file $file_name to quote $quote_prefix$quote_number", $client_id); } else { $_SESSION['alert_type'] = 'error'; $_SESSION['alert_message'] = 'Something went wrong uploading the file - please let the support team know.'; - + logApp("Guest", "error", "Error uploading file to invoice"); } } diff --git a/post/user/file.php b/post/user/file.php index 3864e836..f7b1d678 100644 --- a/post/user/file.php +++ b/post/user/file.php @@ -284,6 +284,8 @@ if (isset($_POST['delete_file'])) { mysqli_query($mysqli,"DELETE FROM files WHERE file_id = $file_id"); + mysqli_query($mysqli,"DELETE FROM quote_files WHERE file_id = $file_id"); + //Logging logAction("File", "Delete", "$session_name deleted file $file_name", $client_id); diff --git a/quote.php b/quote.php index 7b34f0db..dde50ef5 100644 --- a/quote.php +++ b/quote.php @@ -108,11 +108,10 @@ if (isset($_GET['quote_id'])) { $json_products = json_encode($products); } - // Attachments - // Get Ticket Attachments - $sql_quote_attachments = mysqli_query( + // Quote File Attachments + $sql_quote_files = mysqli_query( $mysqli, - "SELECT * FROM quote_attachments WHERE quote_attachments.quote_attachment_quote_id = $quote_id" + "SELECT file_reference_name, file_name, file_created_at FROM quote_files LEFT JOIN files ON quote_files.file_id = files.file_id WHERE quote_id = $quote_id" ); ?> @@ -490,7 +489,7 @@ if (isset($_GET['quote_id'])) {
    - 0) { ?> + 0) { ?>
    @@ -516,14 +515,14 @@ if (isset($_GET['quote_id'])) { - + Date: Mon, 17 Feb 2025 11:14:55 +0000 Subject: [PATCH 8/8] Add DB logic for quote file upload --- database_updates.php | 37 ++++++++++++++++++++++++++++++++--- db.sql | 24 +++++++++++++++++++++-- includes/database_version.php | 2 +- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/database_updates.php b/database_updates.php index 8ee3abf5..287a3684 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2469,10 +2469,41 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.0'"); } - // if (CURRENT_DATABASE_VERSION == '1.8.0') { - // // Insert queries here required to update to DB version 1.8.1 + if (CURRENT_DATABASE_VERSION == '1.8.0') { + + mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_order` int(11) NOT NULL DEFAULT 0"); + + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_order` int(11) NOT NULL DEFAULT 0"); + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_moving_columns` tinyint(1) NOT NULL DEFAULT 1"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.1') { + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` CHANGE `interface_port` `interface_description` VARCHAR(200) DEFAULT NULL AFTER `interface_name`"); + + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` ADD `interface_type` VARCHAR(50) DEFAULT NULL AFTER `interface_description`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.2'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.2') { + mysqli_query($mysqli, "CREATE TABLE `quote_files` ( + `quote_id` INT(11) NOT NULL, + `file_id` INT(11) NOT NULL, + PRIMARY KEY (`quote_id`, `file_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.3'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.8.3') { + // // Insert queries here required to update to DB version 1.8.4 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.4'"); // } } else { diff --git a/db.sql b/db.sql index 31f409e0..c03a9f31 100644 --- a/db.sql +++ b/db.sql @@ -167,11 +167,12 @@ DROP TABLE IF EXISTS `asset_interfaces`; CREATE TABLE `asset_interfaces` ( `interface_id` int(11) NOT NULL AUTO_INCREMENT, `interface_name` varchar(200) NOT NULL, + `interface_description` varchar(200) DEFAULT NULL, + `interface_type` varchar(50) DEFAULT NULL, `interface_mac` varchar(200) DEFAULT NULL, `interface_ip` varchar(200) DEFAULT NULL, `interface_nat_ip` varchar(200) DEFAULT NULL, `interface_ipv6` varchar(200) DEFAULT NULL, - `interface_port` varchar(200) DEFAULT NULL, `interface_notes` text DEFAULT NULL, `interface_primary` tinyint(1) DEFAULT 0, `interface_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -1307,6 +1308,20 @@ CREATE TABLE `quotes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `quote_files` +-- + +DROP TABLE IF EXISTS `quote_files`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `quote_files` ( + `quote_id` int(11) NOT NULL, + `file_id` int(11) NOT NULL, + PRIMARY KEY (`quote_id`,`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `rack_units` -- @@ -1740,6 +1755,9 @@ CREATE TABLE `settings` ( `config_phone_mask` tinyint(1) NOT NULL DEFAULT 1, `config_whitelabel_enabled` int(11) NOT NULL DEFAULT 0, `config_whitelabel_key` text DEFAULT NULL, + `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_moving_columns` tinyint(1) NOT NULL DEFAULT 1, PRIMARY KEY (`company_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2019,6 +2037,7 @@ CREATE TABLE `ticket_statuses` ( `ticket_status_name` varchar(200) NOT NULL, `ticket_status_color` varchar(200) NOT NULL, `ticket_status_active` tinyint(1) NOT NULL DEFAULT 1, + `ticket_status_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_status_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2113,6 +2132,7 @@ CREATE TABLE `tickets` ( `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, + `ticket_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2342,4 +2362,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-01-25 21:47:06 +-- Dump completed on 2025-02-12 17:12:46 diff --git a/includes/database_version.php b/includes/database_version.php index c1d450cd..aa245b7a 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", "1.8.0"); +DEFINE("LATEST_DATABASE_VERSION", "1.8.3");