From 0cf1e338c2a21c7a5946d2e24951ada4b8f9b3ca Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 6 Nov 2025 11:26:08 -0500 Subject: [PATCH] Added data-bulk to the ajax modal to allow for bulk GET collection of selected ids that have a class of bulk-select, converted expense and client bulk modals to use the the new ajax-modal --- .../software_template_add.php | 1 + agent/clients.php | 36 +- agent/expenses.php | 321 +++++++++--------- .../modals/client/client_bulk_add_ticket.php | 274 ++++++++------- .../modals/client/client_bulk_assign_tags.php | 94 ++--- .../client/client_bulk_edit_hourly_rate.php | 64 ++-- .../client/client_bulk_edit_industry.php | 64 ++-- .../client/client_bulk_edit_referral.php | 88 ++--- agent/modals/client/client_bulk_email.php | 203 +++++------ agent/modals/expense/expense_bulk_delete.php | 43 +++ .../expense/expense_bulk_edit_account.php | 106 +++--- .../expense/expense_bulk_edit_category.php | 88 +++-- .../expense/expense_bulk_edit_client.php | 88 +++-- agent/modals/expense/expense_edit.php | 5 +- agent/modals/ticket/ticket_add_watcher.php | 4 +- agent/modals/ticket/ticket_change_client.php | 14 +- agent/modals/ticket/ticket_edit_vendor.php | 16 +- agent/post/ticket.php | 55 +-- js/ajax_modal.js | 126 +++---- js/bulk_actions.js | 68 ++-- 20 files changed, 985 insertions(+), 773 deletions(-) create mode 100644 agent/modals/expense/expense_bulk_delete.php diff --git a/admin/modals/software_template/software_template_add.php b/admin/modals/software_template/software_template_add.php index a0ed9bf0..f592f7aa 100644 --- a/admin/modals/software_template/software_template_add.php +++ b/admin/modals/software_template/software_template_add.php @@ -5,6 +5,7 @@ require_once '../../../includes/modal_header.php'; ob_start(); ?> +
New License Template
- + Open Tickets
- + Set Hourly Rate
- + Set Industry
- + Set Referral
- + Assign Tags
- + Send Email @@ -268,7 +282,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -600,14 +614,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
diff --git a/agent/expenses.php b/agent/expenses.php index 6fd1688d..52b30dc5 100644 --- a/agent/expenses.php +++ b/agent/expenses.php @@ -94,23 +94,30 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Bulk Action (0)
- + Set Category
- + Set Account
- + Set Client
- +
@@ -193,170 +200,162 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- -
- - "> - - - - - - - - - - - - - +
-
- -
- 		- - Date - - - - Category - - / - - Description - - - - Vendor - - - - Amount - - - - Account - - - - Client - - Action
+ "> + + + + + + + + + + + + + "; - } - - ?> - - - - - - - - - - - - - "; + } + ?> - -
+
+ +
+ 		+ + Date + + + + Category + + / + + Description + + + + Vendor + + + + Amount + + + + Account + + + + Client + + Action
-
- -
- 		- - - - - - -
- 		-
- -
- - " download=""> - Download - -
- - - Edit - - - Copy - -
- - Refund - -
- - Delete - -
-
-
-
- - - -
- + + +
+ +
+ + + + + + + + + +
+ + + + + + +
+ +
+ + " download=""> + Download + +
+ + + Edit + + + Copy + +
+ + Refund + +
+ + Delete + +
+
+ + + + + + + + + - + -
-
-
-
Creating Tickets for Clients
- -
- -
+ - - -
+require_once '../../../includes/modal_header.php'; -
- -
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); -
- -
-
- -
-
- -
- -
-
-
+$count = count($selected_ids); -
-
- -
-
- -
- -
-
-
- -
- -
-
- -
- -
-
- -
- -
-
-
- -
- -
- -
-
- -
- -
-
-
-
- - -
-
- value="1" id="billableSwitch"> - -
-
- - -
- -
- - -
- -
- +
+
New Tickets for Client(s)
+
+ +
+ + + +
+ +
+ + +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ + +
+
+ value="1" id="billableSwitch"> + +
+
+ + +
+ +
+ + +
+
+ + -
-
-
-
Bulk Assign Tags
- -
+ - +require_once '../../../includes/modal_header.php'; -
- - +$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); + +$count = count($selected_ids); + +ob_start(); + +?> + +
+
Assign Tags for Clients
+ +
+ +
+ + + + +
+ +
+ + +
+ +
+ +
+
+
+ - + + - $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_tags_select)) { - $tag_id_select = intval($row['tag_id']); - $tag_name_select = nullable_htmlentities($row['tag_name']); - ?> - - - - -
-
- -
- -
- - +
+
-
\ No newline at end of file + +
+ + +
+ + + -
-
-
-
Bulk Edit Hourly Rate
- -
+ +require_once '../../../includes/modal_header.php'; -
- -
-
- -
- -
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); + +$count = count($selected_ids); + +ob_start(); + +?> + +
+
Set Hourly Rate for Client(s)
+ +
+ +
+ + + +
+ +
+ +
+
+
- -
- -
- - +
+
-
+ +
+ + +
+ + + -
-
-
-
Bulk Edit Industry
- -
+ +require_once '../../../includes/modal_header.php'; -
- -
-
- -
- -
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); + +$count = count($selected_ids); + +ob_start(); + +?> + +
+
Set Industry for Client(s)
+ +
+ +
+ + + +
+ +
+ +
+
+
- -
- -
- - +
+
-
+ +
+ + +
+ + + -
-
-
-
Bulk Edit Referral
- -
+ +require_once '../../../includes/modal_header.php'; -
- -
-
- -
- -
- -
-
+ob_start(); + +?> +
+
Set Referral for Clients
+ +
+ +
+ + + +
+ +
+ +
+
+
+ +
+ +
+
-
+ +
+ + +
+ + + -
-
-
-
Bulk Send Email
- + + +
+
Send Emails to Client(s)
+ +
+ +
+ + + +
+ + +
+ +
+
-
- - -
- -
- -
- -
- -
-
- - - -
- -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
- -
- -
- - +
+
+ + +
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
-
\ No newline at end of file + +
+ + +
+
+ + + +
+ + +
+ +
+ +

Are you really, really, really sure?

+
This will permanently delete the selected expense. and ALL associated data?

This process cannot be undone.
+ + +
+ + + +

+ + This will permanently delete the selected expense. +

+

+ This action cannot be undone. +

+ + + +
+
+ + -
-
-
-
Bulk Set Account
- -
-
+ - -
-
- -
- + +
- ?> - - - - -
+
+ +
+
+
+
+
-
+
+ + +
+ + + -
-
-
-
Bulk Set Category
- -
-
+ - -
-
- -
- -
+$count = count($selected_ids); + +// Generate the HTML form content using output buffering. +ob_start(); + +?> +
+
Set Category: Expense
+ +
+ +
+
+ + + + + +
+ +
+
+
+
+
-
+
+ + +
+ + + -
-
-
-
Bulk Set Client
- -
-
+ - -
-
- -
- -
+$count = count($selected_ids); + +// Generate the HTML form content using output buffering. +ob_start(); + +?> + +
+
Set Client: Expense
+ +
+ +
+ + + + +
+ + +
+ +
+
+
+
+
-
+
+ + +
+ + +
+
@@ -237,8 +238,4 @@ ob_start(); - diff --git a/agent/modals/ticket/ticket_add_watcher.php b/agent/modals/ticket/ticket_add_watcher.php index 19ab63ab..0fec509d 100644 --- a/agent/modals/ticket/ticket_add_watcher.php +++ b/agent/modals/ticket/ticket_add_watcher.php @@ -2,8 +2,7 @@ require_once '../../../includes/modal_header.php'; -$ticket_id = intval($_GET['ticket_id'] ?? 0); -$client_id = intval(getFieldById('tickets', $ticket_id, 'ticket_client_id') ?? 0); +$ticket_id = intval($_GET['ticket_id']); ob_start(); @@ -16,7 +15,6 @@ ob_start();
-
diff --git a/agent/modals/ticket/ticket_change_client.php b/agent/modals/ticket/ticket_change_client.php index bfb1a171..1d013525 100644 --- a/agent/modals/ticket/ticket_change_client.php +++ b/agent/modals/ticket/ticket_change_client.php @@ -2,11 +2,17 @@ require_once '../../../includes/modal_header.php'; $ticket_id = intval($_GET['ticket_id']); -$current_client_id = intval(getFieldById('tickets', $ticket_id, 'ticket_client_id')); -$ticket_prefix = nullable_htmlentities(getFieldById('tickets', $ticket_id, 'ticket_prefix')); -$ticket_number = nullable_htmlentities(getFieldById('tickets', $ticket_id, 'ticket_number')); +$sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"); + +$row = mysqli_fetch_array($sql); +$ticket_prefix = nullable_htmlentities($row['ticket_prefix']); +$ticket_number = intval($row['ticket_number']); +$client_id = intval($row['ticket_client_id']); + +// Generate the HTML form content using output buffering. ob_start(); + ?>
@@ -34,7 +40,7 @@ ob_start(); $client_id_select = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> - diff --git a/agent/modals/ticket/ticket_edit_vendor.php b/agent/modals/ticket/ticket_edit_vendor.php index 1ca39270..ada9836c 100644 --- a/agent/modals/ticket/ticket_edit_vendor.php +++ b/agent/modals/ticket/ticket_edit_vendor.php @@ -1,17 +1,23 @@ +
-
Editing ticket Vendor
+
Editing Vendor:
diff --git a/agent/post/ticket.php b/agent/post/ticket.php index fcbadc9a..8b88dfb7 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -443,10 +443,36 @@ if (isset($_POST['add_ticket_watcher'])) { enforceUserPermission('module_support', 2); $ticket_id = intval($_POST['ticket_id']); - $client_id = intval($_POST['client_id']); $watcher_emails = preg_split("/,| |;/", $_POST['watcher_email']); // Split on comma, semicolon or space, we sanitize later $notify = intval($_POST['watcher_notify'] ?? 0); + // Get contact/ticket details + $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_category, ticket_subject, ticket_details, ticket_priority, ticket_status_name, ticket_url_key, ticket_created_by, ticket_assigned_to, ticket_client_id FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_id = $ticket_id + AND ticket_closed_at IS NULL"); + $row = mysqli_fetch_array($sql); + + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_category = sanitizeInput($row['ticket_category']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $ticket_details = mysqli_escape_string($mysqli, $row['ticket_details']); + $ticket_priority = sanitizeInput($row['ticket_priority']); + $ticket_status = sanitizeInput($row['ticket_status_name']); + $url_key = sanitizeInput($row['ticket_url_key']); + $client_id = intval($row['ticket_client_id']); + $ticket_created_by = intval($row['ticket_created_by']); + $ticket_assigned_to = intval($row['ticket_assigned_to']); + + // Get Company Phone Number + $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + $company_name = sanitizeInput($row['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); + // Process each watcher in list foreach ($watcher_emails as $watcher_email) { @@ -459,32 +485,7 @@ if (isset($_POST['add_ticket_watcher'])) { // Notify watcher if ($notify && !empty($config_smtp_host)) { - // Get contact/ticket details - $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_category, ticket_subject, ticket_details, ticket_priority, ticket_status_name, ticket_url_key, ticket_created_by, ticket_assigned_to, ticket_client_id FROM tickets - LEFT JOIN clients ON ticket_client_id = client_id - LEFT JOIN contacts ON ticket_contact_id = contact_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - WHERE ticket_id = $ticket_id - AND ticket_closed_at IS NULL"); - $row = mysqli_fetch_array($sql); - - $ticket_prefix = sanitizeInput($row['ticket_prefix']); - $ticket_number = intval($row['ticket_number']); - $ticket_category = sanitizeInput($row['ticket_category']); - $ticket_subject = sanitizeInput($row['ticket_subject']); - $ticket_details = mysqli_escape_string($mysqli, $row['ticket_details']); - $ticket_priority = sanitizeInput($row['ticket_priority']); - $ticket_status = sanitizeInput($row['ticket_status_name']); - $url_key = sanitizeInput($row['ticket_url_key']); - $client_id = intval($row['ticket_client_id']); - $ticket_created_by = intval($row['ticket_created_by']); - $ticket_assigned_to = intval($row['ticket_assigned_to']); - - // Get Company Phone Number - $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); - $company_name = sanitizeInput($row['company_name']); - $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); + // Email content $data = []; // Queue array diff --git a/js/ajax_modal.js b/js/ajax_modal.js index a4d1b2a1..1d8b1ba0 100644 --- a/js/ajax_modal.js +++ b/js/ajax_modal.js @@ -1,66 +1,74 @@ // Ajax Modal Load Script -// -/* Example Triggering --> - - - -*/ $(document).on('click', '.ajax-modal', function (e) { - e.preventDefault(); + e.preventDefault(); - const $trigger = $(this); - const modalUrl = $trigger.data('modal-url'); - const modalSize = $trigger.data('modal-size') || 'md'; - const modalId = 'ajaxModal_' + new Date().getTime(); + const $trigger = $(this); + let modalUrl = $trigger.data('modal-url'); + const modalSize = $trigger.data('modal-size') || 'md'; + const modalId = 'ajaxModal_' + new Date().getTime(); - // Show loading spinner while fetching content - const loadingSpinner = ` -
- + // -------- Optional bulk mode (activated via data-bulk="true") -------- + if ($trigger.data('bulk') === true || $trigger.data('bulk') === 'true') { + const selector = $trigger.data('bulk-selector') || '.bulk-select:checked'; + const param = $trigger.data('bulk-param') || 'selected_ids[]'; + + const ids = Array.from(document.querySelectorAll(selector)).map(cb => cb.value); + + if (!ids.length) { + alert('Please select at least one item.'); + return; // abort opening modal + } + + // Merge ids into existing query string safely + const urlObj = new URL(modalUrl, window.location.href); + ids.forEach(id => urlObj.searchParams.append(param, id)); + + // Preserve path + updated query (avoid absolute origin for relative AJAX) + modalUrl = urlObj.pathname + (urlObj.search ? '?' + urlObj.searchParams.toString() : ''); + } + // -------------------------------------------------------------------- + + // Show loading spinner while fetching content + const loadingSpinner = ` +
+ +
`; + $('.content-wrapper').append(loadingSpinner); + + // Make AJAX request + $.ajax({ + url: modalUrl, + method: 'GET', + dataType: 'json', + success: function (response) { + $('#modal-loading-spinner').remove(); + + if (response.error) { + alert(response.error); + return; + } + + const modalHtml = ` + `; - $('.content-wrapper').append(loadingSpinner); - // Make AJAX request - $.ajax({ - url: modalUrl, - method: 'GET', - dataType: 'json', - success: function (response) { - $('#modal-loading-spinner').remove(); + $('.content-wrapper').append(modalHtml); + const $modal = $('#' + modalId); + $modal.modal('show'); - if (response.error) { - alert(response.error); - return; - } - - // Build modal wrapper - const modalHtml = ` - `; - - $('.content-wrapper').append(modalHtml); - const $modal = $('#' + modalId); - $modal.modal('show'); - - // Remove modal after it's closed - $modal.on('hidden.bs.modal', function () { - $(this).remove(); - }); - }, - error: function (xhr, status, error) { - $('#modal-loading-spinner').remove(); - alert('Error loading modal content. Please try again.'); - console.error('Modal AJAX Error:', status, error); - } - }); -}); \ No newline at end of file + $modal.on('hidden.bs.modal', function () { + $(this).remove(); + }); + }, + error: function (xhr, status, error) { + $('#modal-loading-spinner').remove(); + alert('Error loading modal content. Please try again.'); + console.error('Modal AJAX Error:', status, error); + } + }); +}); diff --git a/js/bulk_actions.js b/js/bulk_actions.js index f83ced35..39399c2e 100644 --- a/js/bulk_actions.js +++ b/js/bulk_actions.js @@ -1,40 +1,54 @@ -// Allow selecting and editing multiple records at once +// bulk_actions.js +// Allow selecting and editing multiple records at once (no dependency) -var form = document.getElementById("bulkActions"); // Get the form element by its id -var checkboxes = form.querySelectorAll('input[type="checkbox"].bulk-select'); // Select only checkboxes with class "bulk-select" -var selectedCount = document.getElementById("selectedCount"); -var selectAllCheckbox = document.getElementById("selectAllCheckbox"); // The "select all" checkbox - -// Event listener for each checkbox -for (var i = 0; i < checkboxes.length; i++) { - checkboxes[i].addEventListener("click", updateSelectedCount); +// --- Helpers --- +function getCheckboxes() { + // Always query fresh in case rows are re-rendered + return Array.from(document.querySelectorAll('input[type="checkbox"].bulk-select')); +} + +function getSelectedIds() { + return getCheckboxes() + .filter(cb => cb.checked) + .map(cb => cb.value); } -// Function to update the count of selected checkboxes function updateSelectedCount() { - var count = 0; - for (var i = 0; i < checkboxes.length; i++) { - if (checkboxes[i].checked) { - count++; + const count = getSelectedIds().length; + const selectedCountEl = document.getElementById('selectedCount'); + if (selectedCountEl) { + selectedCountEl.textContent = count; } - } - selectedCount.textContent = count; // Display the count - // Show or hide the multi-action button - document.getElementById("bulkActionButton").hidden = count === 0; + const bulkBtn = document.getElementById('bulkActionButton'); + if (bulkBtn) { + bulkBtn.hidden = count === 0; + } } -// Function to check/uncheck all checkboxes +// --- Select All Handling --- function checkAll(source) { - for (var i = 0; i < checkboxes.length; i++) { - checkboxes[i].checked = source.checked; - } - updateSelectedCount(); // Update the count after changing checkbox states + getCheckboxes().forEach(cb => { + cb.checked = source.checked; + }); + updateSelectedCount(); } -// Event listener for the "select all" checkbox +// Wire select-all checkbox if present +const selectAllCheckbox = document.getElementById('selectAllCheckbox'); if (selectAllCheckbox) { - selectAllCheckbox.addEventListener("click", function() { - checkAll(this); - }); + selectAllCheckbox.addEventListener('click', function () { + checkAll(this); + }); } + +// --- Per-row Checkbox Handling --- +// Use event delegation so it still works if table rows are re-rendered +document.addEventListener('click', function (e) { + const cb = e.target.closest('input[type="checkbox"].bulk-select'); + if (!cb) return; + updateSelectedCount(); +}); + +// --- Initialize count on page load --- +document.addEventListener('DOMContentLoaded', updateSelectedCount);