diff --git a/CHANGELOG.md b/CHANGELOG.md index 099c264e..38642ef2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,39 @@ This file documents all notable changes made to ITFlow. +## [25.05] + +### Added / Changed +- Expanded file upload allow-list to include .bat and .stk file types. +- Added full backup/restore functionality. Backup downloads a zip that includes the SQL dump and uploads folder, setup now has option to restore from zip backup. +- Migrated Asset and Contact Links to modals to resolve variable overlap issue. +- Added Pagination to Notification Modal. +- Removed 500 Records Per Page option. +- Removed unused old DB checks in the top nav. +- Clients can now use the portal to setup Stripe automatic payments themselves for recurring invoices +- Automatic payments are now disabled for all recurring invoices if the saved payment method is removed +- Added Card Details and Payment added to Client Stripe. +- UI / UX updates to guest pay Make use of cards. +- Don't show Checkbox columns when ticket is closed, compact ticket list now matches round pills for status and priority. +- Ticket UI/UX update allow the ticket toolbar to be a little more mobile-friendly +- UI / UX Updates to Expenses - Combine Category and Description into 1 column. +- Country information is now displayed in Invoices, Quotes, Recurring Invoices, Clients, Locations, and the client top header. +- Added country-based search filters in Locations and Clients sections. +- Changed the settings name from Integrations to Identity Providers to make room for future iDPs (e.g. Google). +- Bump FullCalendar from 6.1.15 to 6.1.17. +- Bump DataTables from 2.2.2 to 2.3.1. +- Bump TCPDF from 6.8.2 to 6.9.4. +- Bump tinyMCE from 7.7.1 to 7.9.0. +- Bump phpMailer from 6.9.2 to 6.10.0. +- Bump stripe-php from 16.4.0 to 17.2.1. + + +### Fixed +- "None" option for SMTP encryption now functions correctly. +- Debug table row counts now reflect actual counts instead of relying on SHOW TABLE STATUS. +- Archived Categories now display properly. +- Stripe saved payment methods are now limited to credit/debit cards only. + ## [25.03.6] ### Fixed @@ -280,4 +313,4 @@ This file documents all notable changes made to ITFlow. ## [24.12] ### Added / Changed -- Introduced versioned releases for the first time! \ No newline at end of file +- Introduced versioned releases for the first time! diff --git a/SECURITY.md b/SECURITY.md index bd6ba7fd..44ec9dcd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -12,10 +12,8 @@ We operate a rolling release model. Any bug fixes will be released into latest version of ITFlow, so you must stay up-to-date. | Version | Supported | -| ------- | ------------------ | -| Beta | :x: | -| 24.12 | :white_check_mark: | -| 25.1 | :white_check_mark: (When released) | +|---------| ------------------ | +| 25.05 | :white_check_mark: | ## Reporting a Vulnerability via GitHub Security Advisories diff --git a/admin_app_log.php b/admin_app_log.php index f5aa1970..ec30f510 100644 --- a/admin_app_log.php +++ b/admin_app_log.php @@ -48,14 +48,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

App Logs

-
+
-
- -
- - +
+
+ +
+ + +
diff --git a/admin_audit_log.php b/admin_audit_log.php index 980035a3..9f61b0b1 100644 --- a/admin_audit_log.php +++ b/admin_audit_log.php @@ -75,7 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -125,7 +125,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -198,7 +198,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- "> + text-nowrap"> + + + + + + + + + +
diff --git a/admin_backup.php b/admin_backup.php index 841ab95d..6acb4780 100644 --- a/admin_backup.php +++ b/admin_backup.php @@ -8,7 +8,7 @@ require_once "includes/inc_all_admin.php";
If you are unable to back up the entire VM, you'll need to back up the files & database individually. There is no built-in restore. See the docs here.
-

Download database +

Download Backup
@@ -20,12 +20,12 @@ require_once "includes/inc_all_admin.php";
-
-
-
- +
+
+ +
+
-
diff --git a/admin_category.php b/admin_category.php index d27228f5..18bfa5c5 100644 --- a/admin_category.php +++ b/admin_category.php @@ -27,10 +27,6 @@ $sql = mysqli_query( ); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -if (isset($_GET['archived'])) { - $category = "Archived"; -} - ?>
@@ -98,7 +94,7 @@ if (isset($_GET['archived'])) { } else { echo 'btn-default'; } ?>">Ticket - diff --git a/admin_debug.php b/admin_debug.php index dcb11792..edd3cb9c 100644 --- a/admin_debug.php +++ b/admin_debug.php @@ -296,7 +296,13 @@ if ($tablesResult) { while ($table = $tablesResult->fetch_assoc()) { $tableName = $table['Name']; - $tableRows = $table['Rows']; + + // Accurate row count + $countResult = $mysqli->query("SELECT COUNT(*) AS cnt FROM `$tableName`"); + $countRow = $countResult->fetch_assoc(); + $tableRows = $countRow['cnt']; + $countResult->free(); + $dataLength = $table['Data_length']; $indexLength = $table['Index_length']; $tableSize = ($dataLength + $indexLength) / (1024 * 1024); // Size in MB @@ -336,11 +342,6 @@ if ($tablesResult) { 'name' => 'Total database size (MB)', 'value' => round($totalSize, 2) . ' MB', ]; -} else { - $databaseStats[] = [ - 'name' => 'Database connection error', - 'value' => $mysqli->error, - ]; } // Section: Database Structure Comparison @@ -518,24 +519,26 @@ $mysqli->close();
- - - - - - - - - - - - - - - - - -
ITFlow release version
Current DB Version
Current Code Commit
Current Branch
+
+ + + + + + + + + + + + + + + + + +
ITFlow release version
Current DB Version
Current Code Commit
Current Branch
+

System Information

@@ -552,200 +555,209 @@ $mysqli->close();

PHP Extensions and Configuration

- - - - - - - - - - - - - +
+
PHP Extensions
- - - - - -
+ + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + - - - - - - - - - - - - + + + + - - -
PHP Extensions
PHP Configuration
- - - - - -
+ + + + + +
PHP Configuration
Shell Commands
- - - - - -
+ + + + + +
Shell Commands
SSL Checks
- - - - - -
+ + + + + +
SSL Checks
Domain Checks
- - - - - -
+ + + + + +
Domain Checks
+ + + + + +
File Permissions
- - - - - -
File Permissions
- +
+ + + + + +
+

Database Structure Comparison

- - - - +
+
+ + + + + + + + + - - + - - - - - - - -
No discrepancies found between the database and db.sql file.
No discrepancies found between the database and db.sql file.
+ + + +

Uploads Directory Stats

- - - - - - - - - -
+
+ + + + + + + + + +
+

Database Stats

- - - - - - - - - -
+
+ + + + + + + + + +
+

Table Stats

- - - - - - - - - - +
+
Table NameFields / RowsSize (MB)
+ - - - + + + - - -
Table NameFields / RowsSize (MB)
+ + + + + + + + + + + +
diff --git a/admin_settings_integration.php b/admin_identity_provider.php similarity index 59% rename from admin_settings_integration.php rename to admin_identity_provider.php index 408a61ef..2149815d 100644 --- a/admin_settings_integration.php +++ b/admin_identity_provider.php @@ -4,13 +4,29 @@ require_once "includes/inc_all_admin.php";
-

Integration Settings

+

Identity Providers

Client Portal SSO via Microsoft Entra

+ +
+ +
+
+ +
+ +
+
+
@@ -33,11 +49,10 @@ require_once "includes/inc_all_admin.php";
- +
- "> + text-nowrap"> + + + + + + + + + + + + +
diff --git a/admin_settings_company.php b/admin_settings_company.php index dceee89e..17ba0239 100644 --- a/admin_settings_company.php +++ b/admin_settings_company.php @@ -113,7 +113,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
-
+
diff --git a/admin_settings_mail.php b/admin_settings_mail.php index 455bb047..48814e69 100644 --- a/admin_settings_mail.php +++ b/admin_settings_mail.php @@ -295,7 +295,7 @@ require_once "includes/inc_all_admin.php"; - +
@@ -319,7 +319,7 @@ require_once "includes/inc_all_admin.php";
- +
diff --git a/admin_settings_notification.php b/admin_settings_notification.php index 05f326f8..55726f50 100644 --- a/admin_settings_notification.php +++ b/admin_settings_notification.php @@ -18,158 +18,159 @@ require_once "includes/inc_all_admin.php"; docs)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NotificationApp NotifyTech Email NotifyClient Email NotifyCreate Ticket
Expirations
-
Domain Expiration Notice
- - (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) - - 		-
- value="1"> - -
-
-
Certificate Expiration Notice
- - (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) - - 		-
-
Asset Warranty Expiration Notice
- - (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) - - 		-
Billing
-
Invoice Reminders
- - (This will automatically dispatch a reminder email for the invoice to the primary contact's email every 30 days following the invoice's due date.) - - 		- - -
- value="1" id="sendInvoiceRemindersSwitch"> - -
-
-
Send Recurring Invoice
- - (This will notify all primary and billing contacts of a client that a new invoice was generated from recurring invoices) - - 		- - -
- value="1" id="sendRecurringSwitch"> - -
-
Operational
-
Send clients general notification emails
- (Should clients receive automatic emails when tickets are raised/closed?) - 		-
- value="1" id="ticketNotificationSwitch"> - -
-
-
Shared Item View
- (Notify when Shared items are viewed) - 		-
-
Cron Execution
- (Notify when the nightly cron job ran) - 		-
-
ITFlow Updates
- (Notify when ITFlow has an update) - 		-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NotificationApp NotifyTech Email NotifyClient Email NotifyCreate Ticket
Expirations
+
Domain Expiration Notice
+ + (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) + + 		+
+ value="1"> + +
+
+
Certificate Expiration Notice
+ + (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) + + 		+
+
Asset Warranty Expiration Notice
+ + (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) + + 		+
Billing
+
Invoice Reminders
+ + (This will automatically dispatch a reminder email for the invoice to the primary contact's email every 30 days following the invoice's due date.) + + 		+ + +
+ value="1" id="sendInvoiceRemindersSwitch"> + +
+
+
Send Recurring Invoice
+ + (This will notify all primary and billing contacts of a client that a new invoice was generated from recurring invoices) + + 		+ + +
+ value="1" id="sendRecurringSwitch"> + +
+
Operational
+
Send clients general notification emails
+ (Should clients receive automatic emails when tickets are raised/closed?) + 		+
+ value="1" id="ticketNotificationSwitch"> + +
+
+
Shared Item View
+ (Notify when Shared items are viewed) + 		+
+
Cron Execution
+ (Notify when the nightly cron job ran) + 		+
+
ITFlow Updates
+ (Notify when ITFlow has an update) + 		+
+
diff --git a/admin_settings_online_payment_clients.php b/admin_settings_online_payment_clients.php index f160a2b1..c4deb42d 100644 --- a/admin_settings_online_payment_clients.php +++ b/admin_settings_online_payment_clients.php @@ -11,56 +11,63 @@ $stripe_clients_sql = mysqli_query($mysqli, "SELECT * FROM client_stripe LEFT JO
- - - - - - - - - - - - - - +
+
ClientStripe Customer IDStripe Payment IDAction
+ - - - - - + + + + + + + + - + -
-
- -
- - - Delete payment method - - - - Reset Stripe - - -
-
- 		ClientStripe Customer IDStripe Payment IDPayment DetailsCreatedAction
+ ?> + +
+
+ +
+ + + Delete payment method + + + + Reset Stripe + + +
+
+
+
diff --git a/admin_ticket_status.php b/admin_ticket_status.php index 6c687a0e..8b98dcff 100644 --- a/admin_ticket_status.php +++ b/admin_ticket_status.php @@ -1,7 +1,7 @@ Active
"; } else { - $ticket_status_display = "
Disabled
"; + $ticket_status_display = "
Inactive
"; } ?> @@ -97,7 +97,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - 5 ) { ?>
- diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index b8280aed..99b3ab78 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -20,7 +20,7 @@ $sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WH $row = mysqli_fetch_array($sql_ticket_templates); $ticket_template_name = nullable_htmlentities($row['ticket_template_name']); -$ticket_template_description = nullable_htmlentities($row['ticket_template_description']); +//$ticket_template_description = nullable_htmlentities($row['ticket_template_description']); $ticket_template_subject = nullable_htmlentities($row['ticket_template_subject']); $ticket_template_details = $purifier->purify($row['ticket_template_details']); $ticket_template_created_at = nullable_htmlentities($row['ticket_template_created_at']); @@ -45,7 +45,7 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
-
+
@@ -54,7 +54,7 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE

-
+
@@ -72,7 +72,7 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
-
+
@@ -82,11 +82,8 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
-
-
- -
- +
+
@@ -99,19 +96,18 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE $task_id = intval($row['task_template_id']); $task_name = nullable_htmlentities($row['task_template_name']); $task_completion_estimate = intval($row['task_template_completion_estimate']); - $task_description = nullable_htmlentities($row['task_template_description']); + //$task_description = nullable_htmlentities($row['task_template_description']); ?> - - m - - + +
-
+ +
+
Link Credential to
+ +
+ + +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+ + + diff --git a/ajax/ajax_asset_link_document.php b/ajax/ajax_asset_link_document.php new file mode 100644 index 00000000..82020756 --- /dev/null +++ b/ajax/ajax_asset_link_document.php @@ -0,0 +1,70 @@ + + +
+
Link Document to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_asset_link_file.php b/ajax/ajax_asset_link_file.php new file mode 100644 index 00000000..6cfdf871 --- /dev/null +++ b/ajax/ajax_asset_link_file.php @@ -0,0 +1,73 @@ + + +
+
Link File to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_asset_link_service.php b/ajax/ajax_asset_link_service.php new file mode 100644 index 00000000..4e538aa2 --- /dev/null +++ b/ajax/ajax_asset_link_service.php @@ -0,0 +1,68 @@ + + +
+
Link Service to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + + + +
+
License Software to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + + +
+
Link Asset to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_contact_link_credential.php b/ajax/ajax_contact_link_credential.php new file mode 100644 index 00000000..83e3e09c --- /dev/null +++ b/ajax/ajax_contact_link_credential.php @@ -0,0 +1,67 @@ + + +
+
Link Credential to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_contact_link_document.php b/ajax/ajax_contact_link_document.php new file mode 100644 index 00000000..d177919b --- /dev/null +++ b/ajax/ajax_contact_link_document.php @@ -0,0 +1,70 @@ + + +
+
Link Document to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_contact_link_file.php b/ajax/ajax_contact_link_file.php new file mode 100644 index 00000000..debbbd0a --- /dev/null +++ b/ajax/ajax_contact_link_file.php @@ -0,0 +1,72 @@ + + +
+
Link File to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + + +
+
Link Service to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + + +
+
License Software to
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ + diff --git a/ajax/ajax_custom_ticket_status_edit.php b/ajax/ajax_custom_ticket_status_edit.php index 121b115a..c9a3ad16 100644 --- a/ajax/ajax_custom_ticket_status_edit.php +++ b/ajax/ajax_custom_ticket_status_edit.php @@ -8,6 +8,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM ticket_statuses WHERE ticket_status_ $row = mysqli_fetch_array($sql); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); +$ticket_status_order = intval($row['ticket_status_order']); $ticket_status_active = intval($row['ticket_status_active']); // Generate the HTML form content using output buffering. @@ -30,7 +31,7 @@ ob_start();
- + >
@@ -44,6 +45,16 @@ ob_start();
+
+ +
+
+ +
+ +
+
+
@@ -52,7 +63,7 @@ ob_start();
diff --git a/ajax/ajax_notifications.php b/ajax/ajax_notifications.php index dbb7e701..8652b8ad 100644 --- a/ajax/ajax_notifications.php +++ b/ajax/ajax_notifications.php @@ -25,46 +25,56 @@ ob_start();
+ + - + + + + + + - - -
- - - - - - +
+ + + + + +
+ + +
+
+ +
- - - - -
+ +

No Notifications

-
+
= totalPages - 1); + $("#page-indicator").text(`Page ${page + 1} of ${totalPages} (${totalItems} total)`); + } + + $("#prev-btn").on("click", function () { + if (currentPage > 0) { + currentPage--; + showPage(currentPage); + } + }); + + $("#next-btn").on("click", function () { + if (currentPage < totalPages - 1) { + currentPage++; + showPage(currentPage); + } + }); + + if (totalItems <= perPage) { + $("#prev-btn, #next-btn, #page-indicator").hide(); + } + + showPage(currentPage); +}); + +
+
+ +
+
+ +
+ +
+
- + License
- + Credential
- + Service
- + Document
- + File - - - +
@@ -1193,10 +1206,4 @@ require_once "modals/credential_add_modal.php"; require_once "modals/client_document_add_modal.php"; require_once "modals/client_file_upload_modal.php"; -require_once "modals/asset_link_software_modal.php"; -require_once "modals/asset_link_credential_modal.php"; -require_once "modals/asset_link_service_modal.php"; -require_once "modals/asset_link_document_modal.php"; -require_once "modals/asset_link_file_modal.php"; - require_once "includes/footer.php"; diff --git a/assets.php b/assets.php index ad5c230e..f6d0f1cb 100644 --- a/assets.php +++ b/assets.php @@ -205,7 +205,7 @@ if (mysqli_num_rows($os_sql) > 0) {
-
+
@@ -338,7 +338,7 @@ if (mysqli_num_rows($os_sql) > 0) {
- "> + text-nowrap"> + ">
-
+
" autofocus>
@@ -126,7 +126,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ">Leads
-
+
"> Archived @@ -248,7 +248,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -519,7 +519,7 @@ if (mysqli_num_rows($os_sql) > 0) { if ($contact_name) { $contact_name_display = " $contact_name $contact_archive_display diff --git a/client/includes/header.php b/client/includes/header.php index f06abcdc..06a53e4c 100644 --- a/client/includes/header.php +++ b/client/includes/header.php @@ -56,6 +56,7 @@ header("X-Frame-Options: DENY"); // Legacy
Invoices + Recurring Invoices Quotes Auto Payment
diff --git a/client/post.php b/client/post.php index ea329e89..03ec1773 100644 --- a/client/post.php +++ b/client/post.php @@ -38,7 +38,7 @@ if (isset($_POST['add_ticket'])) { $new_config_ticket_next_number = $config_ticket_next_number + 1; mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Portal', ticket_category = $category, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = $session_user_id, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); $ticket_id = mysqli_insert_id($mysqli); // Notify agent DL of the new ticket, if populated with a valid email @@ -424,7 +424,7 @@ if (isset($_POST['edit_contact'])) { logAction("Contact", "Edit", "Client contact $session_contact_name edited contact $contact_name in the client portal", $session_client_id, $contact_id); $_SESSION['alert_message'] = "Contact $contact_name updated"; - + header('Location: contacts.php'); customAction('contact_update', $contact_id); @@ -597,10 +597,22 @@ if (isset($_GET['stripe_save_card'])) { // Get some card/payment method details for the email/logging $payment_method_details = $stripe->paymentMethods->retrieve($payment_method); - $card_info = sanitizeInput($payment_method_details->card->display_brand) . " " . sanitizeInput($payment_method_details->card->last4); + $card_type = sanitizeInput($payment_method_details->card->brand); + $last4 = sanitizeInput($payment_method_details->card->last4); + $expiry_month = sanitizeInput($payment_method_details->card->exp_month); + $expiry_year = sanitizeInput($payment_method_details->card->exp_year); + + // Format the payment details string (Visa - 4324 | Exp 12/25) + $stripe_pm_details = "$card_type - $last4 | Exp $expiry_month/$expiry_year"; + + // Save the formatted payment details into stripe_pm_details + $update_query = " + UPDATE client_stripe + SET stripe_pm_details = '$stripe_pm_details' + WHERE client_id = $session_client_id LIMIT 1"; + mysqli_query($mysqli, $update_query); // Send email confirmation - // Company Details & Settings $sql_settings = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); $row = mysqli_fetch_array($sql_settings); @@ -617,7 +629,7 @@ if (isset($_GET['stripe_save_card'])) { if (!empty($config_smtp_host)) { $subject = "Payment method saved"; - $body = "Hello $session_contact_name,

We’re writing to confirm that your payment details have been securely stored with Stripe, our trusted payment processor.

By agreeing to save your payment information, you have authorized us to automatically bill your card ($card_info) for any future invoices. The payment details you’ve provided are securely stored with Stripe and will be used solely for invoices. We do not have access to your full card details.

You may update or remove your payment information at any time using the portal.

Thank you for your business!

--
$company_name - Billing Department
$config_invoice_from_email
$company_phone"; + $body = "Hello $session_contact_name,

We’re writing to confirm that your payment details have been securely stored with Stripe, our trusted payment processor.

By agreeing to save your payment information, you have authorized us to automatically bill your card ($stripe_pm_details) for any future invoices. The payment details you’ve provided are securely stored with Stripe and will be used solely for invoices. We do not have access to your full card details.

You may update or remove your payment information at any time using the portal.

Thank you for your business!

--
$company_name - Billing Department
$config_invoice_from_email
$company_phone"; $data = [ [ @@ -635,12 +647,11 @@ if (isset($_GET['stripe_save_card'])) { } // Logging - logAction("Stripe", "Update", "$session_contact_name saved payment method ($card_info) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); + logAction("Stripe", "Update", "$session_contact_name saved payment method ($stripe_pm_details) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); // Redirect $_SESSION['alert_message'] = "Payment method saved - thank you"; header('Location: autopay.php'); - } if (isset($_GET['stripe_remove_pm'])) { @@ -677,11 +688,65 @@ if (isset($_GET['stripe_remove_pm'])) { } // Remove payment method from ITFlow - mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $session_client_id LIMIT 1"); - + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL, stripe_pm_details = NULL WHERE client_id = $session_client_id LIMIT 1"); + + // Remove Auto Pay on recurring invoices that are stripe + $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $session_client_id"); + + while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + $recurring_invoice_id = intval($row['recurring_invoice_id']); + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + } + // Logging & Redirect logAction("Stripe", "Update", "$session_contact_name deleted saved Stripe payment method (PM: $payment_method)", $session_client_id, $session_client_id); $_SESSION['alert_message'] = "Payment method removed"; header('Location: autopay.php'); -} \ No newline at end of file +} + +if (isset($_POST['add_recurring_payment'])) { + + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); + + // Get Recurring Info for logging and alerting + $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); + $row = mysqli_fetch_array($sql); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']); + + mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$recurring_invoice_currency_code', recurring_payment_account_id = $config_stripe_account, recurring_payment_method = 'Stripe', recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + + // Get Payment ID for reference + $recurring_payment_id = mysqli_insert_id($mysqli); + + // Logging + logAction("Recurring Invoice", "Auto Payment", "$session_name created Auto Pay for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number in the amount of " . numfmt_format_currency($currency_format, $recurring_invoice_amount, $recurring_invoice_currency_code), $session_client_id, $recurring_invoice_id); + + + $_SESSION['alert_message'] = "Automatic Payment enabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['delete_recurring_payment'])) { + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); + + // Get the invoice total and details + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); + $row = mysqli_fetch_array($sql); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + + mysqli_query($mysqli,"DELETE FROM recurring_payments WHERE recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + + // Logging + logAction("Recurring Invoice", "Auto Payment", "$session_name removed auto Pay from Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $session_client_id, $recurring_invoice_id); + + $_SESSION['alert_message'] = "Automatic Payment disabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/client/recurring_invoices.php b/client/recurring_invoices.php new file mode 100644 index 00000000..6f0c15c1 --- /dev/null +++ b/client/recurring_invoices.php @@ -0,0 +1,120 @@ + + +

Recurring Invoices

+
+ +
+ + + + + + + + + + + + + + + + + + + "; + } else { + $auto_pay_display = " + + Create + + "; + //require "recurring_payment_add_modal.php"; + } + } + + if (empty($recurring_invoice_scope)) { + $recurring_invoice_scope_display = "-"; + } else { + $recurring_invoice_scope_display = $recurring_invoice_scope; + } + ?> + + + + + + + + + + + + + +
ScopeAmountNext Bill DateFrequencyAuto Pay
ly + +
+ + + + + + +
+ + Add Card Details First + +
+ +
+ +
+ + -
No device--
- "> + text-nowrap"> @@ -417,7 +421,7 @@ if (isset($_GET['invoice_id'])) { - > + >
@@ -779,11 +783,11 @@ require_once "includes/footer.php"; { columns: [ { - text: , + text: , style: 'invoiceBillingAddress' }, { - text: , + text: , style: 'invoiceBillingAddressClient' }, ] diff --git a/invoices.php b/invoices.php index 8f185f4c..b697ade7 100644 --- a/invoices.php +++ b/invoices.php @@ -172,7 +172,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -228,7 +228,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -286,7 +286,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) { $location_address_display = "-"; } else { - $location_address_display = "$location_address
$location_city $location_state $location_zip"; + $location_address_display = "$location_address
$location_city $location_state $location_zip
$location_country"; } $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); diff --git a/contact_details.php b/contact_details.php index f77ff726..99047afb 100644 --- a/contact_details.php +++ b/contact_details.php @@ -294,31 +294,47 @@ if (isset($_GET['contact_id'])) {
- + Asset
- + License
- + Credential
- + Service
- + Document
- + File - -
@@ -1192,11 +1208,4 @@ require_once "modals/credential_add_modal.php"; require_once "modals/client_document_add_modal.php"; require_once "modals/client_file_upload_modal.php"; -require_once "modals/contact_link_asset_modal.php"; -require_once "modals/contact_link_software_modal.php"; -require_once "modals/contact_link_credential_modal.php"; -require_once "modals/contact_link_service_modal.php"; -require_once "modals/contact_link_document_modal.php"; -require_once "modals/contact_link_file_modal.php"; - require_once "includes/footer.php"; diff --git a/contacts.php b/contacts.php index 1ef1c912..9da09fe4 100644 --- a/contacts.php +++ b/contacts.php @@ -110,7 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -165,7 +165,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
@@ -242,7 +242,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- "> + text-nowrap"> - - + - + + + + + + 0) { ?> + + + + + + + +
@@ -335,7 +335,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $credential_tags_display = implode('', $credential_tag_name_display_array); if ($credential_contact_id) { - $credential_contact_display = " @@ -412,11 +412,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ diff --git a/css/itflow_custom.css b/css/itflow_custom.css index 8b93a921..50b0d582 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -21,10 +21,9 @@ } .drag-handle { - cursor: grab; - touch-action: none; - user-select: none; + cursor: grab !important; } + .drag-handle:active { - cursor: grabbing; + cursor: grabbing !important; } \ No newline at end of file diff --git a/css/quote_dropdowns_fix.css b/css/quote_dropdowns_fix.css new file mode 100644 index 00000000..24e039f8 --- /dev/null +++ b/css/quote_dropdowns_fix.css @@ -0,0 +1,15 @@ +/*! + * AdminLTE 3.2.0 Specific Dropdown Fix + * Targets .fix-quote-dropdown only + * Prevents alignment bugs in split button dropdowns going too far left + * (ChatGPT) + */ + +.fix-quote-dropdown .dropdown-menu { + left: auto !important; + right: 0 !important; + top: calc(100% + 0.25rem) !important; + transform: none !important; + min-width: max-content; + z-index: 1050; +} diff --git a/dashboard.php b/dashboard.php index 58b854bf..5165f9e0 100644 --- a/dashboard.php +++ b/dashboard.php @@ -41,7 +41,7 @@ $sql_years_select = mysqli_query($mysqli, " - -
+
>
diff --git a/database_updates.php b/database_updates.php index 3a7a593e..e4fba32d 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3457,10 +3457,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.3'"); } - // if (CURRENT_DATABASE_VERSION == '2.1.3') { - // // Insert queries here required to update to DB version 2.1.4 + if (CURRENT_DATABASE_VERSION == '2.1.3') { + mysqli_query($mysqli, "ALTER TABLE `client_stripe` ADD `stripe_pm_details` VARCHAR(200) DEFAULT NULL AFTER `stripe_pm`"); + mysqli_query($mysqli, "ALTER TABLE `client_stripe` ADD `stripe_pm_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `stripe_pm_details`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.4'"); + } + + + + // if (CURRENT_DATABASE_VERSION == '2.1.4') { + // // Insert queries here required to update to DB version 2.1.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.5'"); // } } else { diff --git a/db.sql b/db.sql index bfb82256..203f5771 100644 --- a/db.sql +++ b/db.sql @@ -482,6 +482,8 @@ CREATE TABLE `client_stripe` ( `client_id` int(11) NOT NULL, `stripe_id` varchar(255) NOT NULL, `stripe_pm` varchar(255) DEFAULT NULL, + `stripe_pm_details` varchar(200) DEFAULT NULL, + `stripe_pm_created_at` datetime NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`client_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2498,4 +2500,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-31 12:05:41 +-- Dump completed on 2025-05-24 13:23:21 diff --git a/domains.php b/domains.php index 4bd988a1..61e2e92e 100644 --- a/domains.php +++ b/domains.php @@ -92,7 +92,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
- "> + text-nowrap"> - - diff --git a/functions.php b/functions.php index 671acedf..1c1e9b6f 100644 --- a/functions.php +++ b/functions.php @@ -705,7 +705,17 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_ $mail->SMTPAuth = $smtp_auth; // Enable SMTP authentication $mail->Username = $config_smtp_username; // SMTP username $mail->Password = $config_smtp_password; // SMTP password - $mail->SMTPSecure = $config_smtp_encryption; // Enable TLS encryption, `ssl` also accepted + if ($config_smtp_encryption == 'None') { + $mail->SMTPOptions = array( + 'ssl' => array( + 'verify_peer' => false, + 'verify_peer_name' => false, + )); + $mail->SMTPSecure = false; + $mail->SMTPAutoTLS = false; + } else { + $mail->SMTPSecure = $config_smtp_encryption; // Enable TLS encryption, `ssl` also accepted + } $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients @@ -1487,7 +1497,7 @@ function appNotify($type, $details, $action = null, $client_id = 0, $entity_id = $sql = mysqli_query($mysqli, "SELECT user_id FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL "); - + while ($row = mysqli_fetch_array($sql)) { $user_id = intval($row['user_id']); @@ -1535,7 +1545,7 @@ function getFallback($data) { * @param int $id The record's id. * @param string $field The field (column) to retrieve. * @param string $escape_method The escape method: 'sql' (default, auto-detects int), 'html', 'json', or 'int'. - * + * * @return mixed The escaped field value, or null if not found or invalid input. */ function getFieldById($table, $id, $field, $escape_method = 'sql') { @@ -1631,7 +1641,7 @@ function display_folder_options($parent_folder_id, $client_id, $folder_location // Check if this folder is selected $selected = ''; - if ((isset($_GET['folder_id']) && intval($_GET['folder_id']) === $folder_id) || + if ((isset($_GET['folder_id']) && intval($_GET['folder_id']) === $folder_id) || (isset($_POST['folder']) && intval($_POST['folder']) === $folder_id)) { $selected = 'selected'; } @@ -1641,4 +1651,4 @@ function display_folder_options($parent_folder_id, $client_id, $folder_location // Recursively display subfolders display_folder_options($folder_id, $client_id, $folder_location, $indent + 1); } -} \ No newline at end of file +} diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php index 8c35e4eb..7e73c451 100644 --- a/guest/guest_ajax.php +++ b/guest/guest_ajax.php @@ -97,9 +97,7 @@ if (isset($_GET['stripe_create_pi'])) { 'itflow_invoice_number' => $invoice_prefix . $invoice_number, 'itflow_invoice_id' => $invoice_id, ], - 'automatic_payment_methods' => [ - 'enabled' => true, - ], + 'payment_method_types' => ['card'], ]); $output = [ diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php index c50758d6..4d6127bd 100644 --- a/guest/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -97,71 +97,85 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
-

Payment for Invoice:

-
-
-
diff --git a/expenses.php b/expenses.php index 6b330e12..9e1da9ec 100644 --- a/expenses.php +++ b/expenses.php @@ -228,19 +228,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Date -
- - Vendor - - Category + / + + Description + - - Description + + Vendor @@ -313,9 +312,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
+
- - - - - - - - - +
+
+

Payment for Invoice:

+
+
+
ProductQtyTotal
+ - - - + + + + + + + $item_total = 0; + while ($row = mysqli_fetch_array($sql_invoice_items)) { + $item_name = nullable_htmlentities($row['item_name']); + $item_quantity = floatval($row['item_quantity']); + $item_total = floatval($row['item_total']); + ?> + + + + + - -
ProductQtyTotal
+ + 0) { ?> +
Discount + +
Paid + +
+
-
- 0){ echo "Discount: " . numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); } ?> - -
- 0) { ?> Already paid:
-

Payment Total:

-
-

- - - -
-
diff --git a/includes/get_settings.php b/includes/get_settings.php index d142b709..80e6fa7b 100644 --- a/includes/get_settings.php +++ b/includes/get_settings.php @@ -121,6 +121,8 @@ $config_log_retention = intval($row['config_log_retention']); // Locale $config_currency_format = "US_en"; $config_timezone = $row['config_timezone']; +$config_date_format = "Y-m-d"; +$config_time_format = "H:i"; // Theme $config_theme = $row['config_theme']; diff --git a/includes/inc_client_top_head.php b/includes/inc_client_top_head.php index e82f7e8c..208ee51e 100644 --- a/includes/inc_client_top_head.php +++ b/includes/inc_client_top_head.php @@ -59,7 +59,12 @@
@@ -307,6 +310,7 @@ if (isset($_GET['invoice_id'])) {

    • +
    • @@ -317,6 +321,7 @@ if (isset($_GET['invoice_id'])) {

    • +
    • @@ -380,31 +385,30 @@ if (isset($_GET['invoice_id'])) {
    -
    -
    - + +
    + -
    -
    -
    - -
    - - Edit - -
    - Delete -
    +
    + + Edit + +
    + Delete
    +
    - "> + text-nowrap"> +
    diff --git a/js/guest_pay_invoice_stripe.js b/js/guest_pay_invoice_stripe.js index ab8a60d5..d867a575 100644 --- a/js/guest_pay_invoice_stripe.js +++ b/js/guest_pay_invoice_stripe.js @@ -23,9 +23,6 @@ async function initialize() { elements = stripe.elements({ clientSecret }); - const linkAuthenticationElement = elements.create("linkAuthentication"); - linkAuthenticationElement.mount("#link-authentication-element"); - const paymentElementOptions = { layout: "tabs", }; diff --git a/locations.php b/locations.php index 87f8e73f..dbdf2dc3 100644 --- a/locations.php +++ b/locations.php @@ -47,7 +47,7 @@ $sql = mysqli_query( LEFT JOIN tags ON tags.tag_id = location_tags.tag_id WHERE location_$archive_query $tag_query - AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') + AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_city LIKE '%$q%' OR location_state LIKE '%$q%' OR location_zip LIKE '%$q%' OR location_country LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') $access_permission_query $client_query GROUP BY location_id @@ -99,7 +99,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    @@ -333,7 +333,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    		" target="_blank">
    		" target="_blank">
    $location_country"; ?>    		 diff --git a/modals/asset_link_credential_modal.php b/modals/asset_link_credential_modal.php deleted file mode 100644 index 8a1ca42b..00000000 --- a/modals/asset_link_credential_modal.php +++ /dev/null @@ -1,51 +0,0 @@ - diff --git a/modals/asset_link_document_modal.php b/modals/asset_link_document_modal.php deleted file mode 100644 index 52c6eb5d..00000000 --- a/modals/asset_link_document_modal.php +++ /dev/null @@ -1,57 +0,0 @@ - diff --git a/modals/asset_link_file_modal.php b/modals/asset_link_file_modal.php deleted file mode 100644 index 3c8f7e1f..00000000 --- a/modals/asset_link_file_modal.php +++ /dev/null @@ -1,59 +0,0 @@ - diff --git a/modals/asset_link_service_modal.php b/modals/asset_link_service_modal.php deleted file mode 100644 index 89f55ece..00000000 --- a/modals/asset_link_service_modal.php +++ /dev/null @@ -1,56 +0,0 @@ - diff --git a/modals/asset_link_software_modal.php b/modals/asset_link_software_modal.php deleted file mode 100644 index 747d177e..00000000 --- a/modals/asset_link_software_modal.php +++ /dev/null @@ -1,58 +0,0 @@ - diff --git a/modals/client_file_upload_modal.php b/modals/client_file_upload_modal.php index f0bcc73a..02f1fd42 100644 --- a/modals/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -44,7 +44,7 @@
    - +
    Up to 20 files can be uploaded at once by holding down CTRL and selecting files diff --git a/modals/contact_link_asset_modal.php b/modals/contact_link_asset_modal.php deleted file mode 100644 index 2d957ad2..00000000 --- a/modals/contact_link_asset_modal.php +++ /dev/null @@ -1,51 +0,0 @@ - diff --git a/modals/contact_link_credential_modal.php b/modals/contact_link_credential_modal.php deleted file mode 100644 index fb5e41c0..00000000 --- a/modals/contact_link_credential_modal.php +++ /dev/null @@ -1,51 +0,0 @@ - diff --git a/modals/contact_link_document_modal.php b/modals/contact_link_document_modal.php deleted file mode 100644 index 26973df7..00000000 --- a/modals/contact_link_document_modal.php +++ /dev/null @@ -1,57 +0,0 @@ - diff --git a/modals/contact_link_file_modal.php b/modals/contact_link_file_modal.php deleted file mode 100644 index e8cf363f..00000000 --- a/modals/contact_link_file_modal.php +++ /dev/null @@ -1,59 +0,0 @@ - diff --git a/modals/contact_link_service_modal.php b/modals/contact_link_service_modal.php deleted file mode 100644 index a65ecffd..00000000 --- a/modals/contact_link_service_modal.php +++ /dev/null @@ -1,56 +0,0 @@ - diff --git a/modals/contact_link_software_modal.php b/modals/contact_link_software_modal.php deleted file mode 100644 index 0afc59d4..00000000 --- a/modals/contact_link_software_modal.php +++ /dev/null @@ -1,58 +0,0 @@ - diff --git a/modals/invoice_recurring_add_modal.php b/modals/invoice_recurring_add_modal.php index 463f4bd9..dead0ff5 100644 --- a/modals/invoice_recurring_add_modal.php +++ b/modals/invoice_recurring_add_modal.php @@ -27,7 +27,7 @@
    - +
    diff --git a/modals/project_add_modal.php b/modals/project_add_modal.php index 90c047cd..8f2ba7de 100644 --- a/modals/project_add_modal.php +++ b/modals/project_add_modal.php @@ -88,25 +88,25 @@ -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    diff --git a/modals/project_link_ticket_modal.php b/modals/project_link_ticket_modal.php index c50e287c..72ad05ee 100644 --- a/modals/project_link_ticket_modal.php +++ b/modals/project_link_ticket_modal.php @@ -2,7 +2,7 @@
    -
    Link Ticket to Project:
    +
    Link open ticket to project:
    @@ -18,17 +18,18 @@
    @@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    @@ -159,7 +159,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> + text-nowrap"> ").appendTo(a)),c.nTHead=p[0],a.children("tbody")),n=(0===n.length&&(n=H("").insertAfter(p)),c.nTBody=n[0],a.children("tfoot")),R=(0===n.length&&(n=H("").appendTo(a)),c.nTFoot=n[0],c.aiDisplay=c.aiDisplayMaster.slice(),c.bInitialised=!0,c.oLanguage);H.extend(!0,R,e.oLanguage),R.sUrl?H.ajax({dataType:"json",url:R.sUrl,success:function(e){B(r.oLanguage,e),H.extend(!0,R,e,c.oInit.oLanguage),G(c,null,"i18n",[c],!0),Me(c)},error:function(){z(c,0,"i18n file loading error",21),Me(c)}}):(G(c,null,"i18n",[c],!0),Me(c))}}),E=null,this)},g=(V.ext=T={buttons:{},classes:{},builder:"bs4/dt-2.2.2",errMode:"alert",feature:[],features:{},search:[],selector:{cell:[],column:[],row:[]},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{className:{},detect:[],render:{},search:{},order:{}},_unique:0,fnVersionCheck:V.fnVersionCheck,iApiIndex:0,sVersion:V.version},H.extend(T,{afnFiltering:T.search,aTypes:T.type.detect,ofnSearch:T.type.search,oSort:T.type.order,afnSortData:T.order,aoFeatures:T.feature,oStdClasses:T.classes,oPagination:T.pager}),H.extend(V.ext.classes,{container:"dt-container",empty:{row:"dt-empty"},info:{container:"dt-info"},layout:{row:"dt-layout-row",cell:"dt-layout-cell",tableRow:"dt-layout-table",tableCell:"",start:"dt-layout-start",end:"dt-layout-end",full:"dt-layout-full"},length:{container:"dt-length",select:"dt-input"},order:{canAsc:"dt-orderable-asc",canDesc:"dt-orderable-desc",isAsc:"dt-ordering-asc",isDesc:"dt-ordering-desc",none:"dt-orderable-none",position:"sorting_"},processing:{container:"dt-processing"},scrolling:{body:"dt-scroll-body",container:"dt-scroll",footer:{self:"dt-scroll-foot",inner:"dt-scroll-footInner"},header:{self:"dt-scroll-head",inner:"dt-scroll-headInner"}},search:{container:"dt-search",input:"dt-input"},table:"dataTable",tbody:{cell:"",row:""},thead:{cell:"",row:""},tfoot:{cell:"",row:""},paging:{active:"current",button:"dt-paging-button",container:"dt-paging",disabled:"disabled",nav:""}}),{}),N=/[\r\n\u2028]/g,F=/<([^>]*>)/g,O=Math.pow(2,28),j=/^\d{2,4}[./-]\d{1,2}[./-]\d{1,2}([T ]{1}\d{1,2}[:.]\d{2}([.:]\d{2})?)?$/,R=new RegExp("(\\"+["/",".","*","+","?","|","(",")","[","]","{","}","\\","$","^","-"].join("|\\")+")","g"),P=/['\u00A0,$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi,_=function(e){return!e||!0===e||"-"===e},E=function(e,t){return g[t]||(g[t]=new RegExp(Pe(t),"g")),"string"==typeof e&&"."!==t?e.replace(/\./g,"").replace(g[t],"."):e},b=function(e,t,n){var r=[],a=0,o=e.length;if(void 0!==n)for(;aO)throw new Error("Exceeded max str len");var t;for(e=e.replace(F,"");(e=(t=e).replace(/ + \ No newline at end of file diff --git a/quotes.php b/quotes.php index b37e40c3..3e5f5764 100644 --- a/quotes.php +++ b/quotes.php @@ -111,7 +111,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    diff --git a/plugins/DataTables/datatables.css b/plugins/DataTables/datatables.css index 67636500..e99d0266 100644 --- a/plugins/DataTables/datatables.css +++ b/plugins/DataTables/datatables.css @@ -4,10 +4,10 @@ * * To rebuild or modify this file with the latest versions of the included * software please visit: - * https://datatables.net/download/#bs4/dt-2.2.2 + * https://datatables.net/download/#bs4/dt-2.3.1 * * Included libraries: - * DataTables 2.2.2 + * DataTables 2.3.1 */ :root { @@ -104,24 +104,14 @@ table.dataTable thead > tr > td.dt-ordering-desc span.dt-column-order:after { content: "\25BC"; content: "\25BC"/""; } -table.dataTable thead > tr > th.dt-orderable-asc, table.dataTable thead > tr > th.dt-orderable-desc, table.dataTable thead > tr > th.dt-ordering-asc, table.dataTable thead > tr > th.dt-ordering-desc, -table.dataTable thead > tr > td.dt-orderable-asc, -table.dataTable thead > tr > td.dt-orderable-desc, -table.dataTable thead > tr > td.dt-ordering-asc, -table.dataTable thead > tr > td.dt-ordering-desc { - position: relative; - padding-right: 30px; -} table.dataTable thead > tr > th.dt-orderable-asc span.dt-column-order, table.dataTable thead > tr > th.dt-orderable-desc span.dt-column-order, table.dataTable thead > tr > th.dt-ordering-asc span.dt-column-order, table.dataTable thead > tr > th.dt-ordering-desc span.dt-column-order, table.dataTable thead > tr > td.dt-orderable-asc span.dt-column-order, table.dataTable thead > tr > td.dt-orderable-desc span.dt-column-order, table.dataTable thead > tr > td.dt-ordering-asc span.dt-column-order, table.dataTable thead > tr > td.dt-ordering-desc span.dt-column-order { - position: absolute; - right: 12px; - top: 0; - bottom: 0; + position: relative; width: 12px; + height: 20px; } table.dataTable thead > tr > th.dt-orderable-asc span.dt-column-order:before, table.dataTable thead > tr > th.dt-orderable-asc span.dt-column-order:after, table.dataTable thead > tr > th.dt-orderable-desc span.dt-column-order:before, table.dataTable thead > tr > th.dt-orderable-desc span.dt-column-order:after, table.dataTable thead > tr > th.dt-ordering-asc span.dt-column-order:before, table.dataTable thead > tr > th.dt-ordering-asc span.dt-column-order:after, table.dataTable thead > tr > th.dt-ordering-desc span.dt-column-order:before, table.dataTable thead > tr > th.dt-ordering-desc span.dt-column-order:after, table.dataTable thead > tr > td.dt-orderable-asc span.dt-column-order:before, @@ -163,6 +153,40 @@ table.dataTable thead > tr > td:active { outline: none; } +table.dataTable thead > tr > th div.dt-column-header, +table.dataTable thead > tr > th div.dt-column-footer, +table.dataTable thead > tr > td div.dt-column-header, +table.dataTable thead > tr > td div.dt-column-footer, +table.dataTable tfoot > tr > th div.dt-column-header, +table.dataTable tfoot > tr > th div.dt-column-footer, +table.dataTable tfoot > tr > td div.dt-column-header, +table.dataTable tfoot > tr > td div.dt-column-footer { + display: flex; + justify-content: space-between; + align-items: center; + gap: 4px; +} +table.dataTable thead > tr > th div.dt-column-header span.dt-column-title, +table.dataTable thead > tr > th div.dt-column-footer span.dt-column-title, +table.dataTable thead > tr > td div.dt-column-header span.dt-column-title, +table.dataTable thead > tr > td div.dt-column-footer span.dt-column-title, +table.dataTable tfoot > tr > th div.dt-column-header span.dt-column-title, +table.dataTable tfoot > tr > th div.dt-column-footer span.dt-column-title, +table.dataTable tfoot > tr > td div.dt-column-header span.dt-column-title, +table.dataTable tfoot > tr > td div.dt-column-footer span.dt-column-title { + flex-grow: 1; +} +table.dataTable thead > tr > th div.dt-column-header span.dt-column-title:empty, +table.dataTable thead > tr > th div.dt-column-footer span.dt-column-title:empty, +table.dataTable thead > tr > td div.dt-column-header span.dt-column-title:empty, +table.dataTable thead > tr > td div.dt-column-footer span.dt-column-title:empty, +table.dataTable tfoot > tr > th div.dt-column-header span.dt-column-title:empty, +table.dataTable tfoot > tr > th div.dt-column-footer span.dt-column-title:empty, +table.dataTable tfoot > tr > td div.dt-column-header span.dt-column-title:empty, +table.dataTable tfoot > tr > td div.dt-column-footer span.dt-column-title:empty { + display: none; +} + div.dt-scroll-body > table.dataTable > thead > tr > th, div.dt-scroll-body > table.dataTable > thead > tr > td { overflow: hidden; @@ -258,10 +282,25 @@ table.dataTable td.dt-type-numeric, table.dataTable td.dt-type-date { text-align: right; } +table.dataTable th.dt-type-numeric div.dt-column-header, +table.dataTable th.dt-type-numeric div.dt-column-footer, table.dataTable th.dt-type-date div.dt-column-header, +table.dataTable th.dt-type-date div.dt-column-footer, +table.dataTable td.dt-type-numeric div.dt-column-header, +table.dataTable td.dt-type-numeric div.dt-column-footer, +table.dataTable td.dt-type-date div.dt-column-header, +table.dataTable td.dt-type-date div.dt-column-footer { + flex-direction: row-reverse; +} table.dataTable th.dt-left, table.dataTable td.dt-left { text-align: left; } +table.dataTable th.dt-left div.dt-column-header, +table.dataTable th.dt-left div.dt-column-footer, +table.dataTable td.dt-left div.dt-column-header, +table.dataTable td.dt-left div.dt-column-footer { + flex-direction: row; +} table.dataTable th.dt-center, table.dataTable td.dt-center { text-align: center; @@ -270,10 +309,22 @@ table.dataTable th.dt-right, table.dataTable td.dt-right { text-align: right; } +table.dataTable th.dt-right div.dt-column-header, +table.dataTable th.dt-right div.dt-column-footer, +table.dataTable td.dt-right div.dt-column-header, +table.dataTable td.dt-right div.dt-column-footer { + flex-direction: row-reverse; +} table.dataTable th.dt-justify, table.dataTable td.dt-justify { text-align: justify; } +table.dataTable th.dt-justify div.dt-column-header, +table.dataTable th.dt-justify div.dt-column-footer, +table.dataTable td.dt-justify div.dt-column-header, +table.dataTable td.dt-justify div.dt-column-footer { + flex-direction: row; +} table.dataTable th.dt-nowrap, table.dataTable td.dt-nowrap { white-space: nowrap; @@ -295,6 +346,16 @@ table.dataTable tfoot th.dt-head-left, table.dataTable tfoot td.dt-head-left { text-align: left; } +table.dataTable thead th.dt-head-left div.dt-column-header, +table.dataTable thead th.dt-head-left div.dt-column-footer, +table.dataTable thead td.dt-head-left div.dt-column-header, +table.dataTable thead td.dt-head-left div.dt-column-footer, +table.dataTable tfoot th.dt-head-left div.dt-column-header, +table.dataTable tfoot th.dt-head-left div.dt-column-footer, +table.dataTable tfoot td.dt-head-left div.dt-column-header, +table.dataTable tfoot td.dt-head-left div.dt-column-footer { + flex-direction: row; +} table.dataTable thead th.dt-head-center, table.dataTable thead td.dt-head-center, table.dataTable tfoot th.dt-head-center, @@ -307,12 +368,32 @@ table.dataTable tfoot th.dt-head-right, table.dataTable tfoot td.dt-head-right { text-align: right; } +table.dataTable thead th.dt-head-right div.dt-column-header, +table.dataTable thead th.dt-head-right div.dt-column-footer, +table.dataTable thead td.dt-head-right div.dt-column-header, +table.dataTable thead td.dt-head-right div.dt-column-footer, +table.dataTable tfoot th.dt-head-right div.dt-column-header, +table.dataTable tfoot th.dt-head-right div.dt-column-footer, +table.dataTable tfoot td.dt-head-right div.dt-column-header, +table.dataTable tfoot td.dt-head-right div.dt-column-footer { + flex-direction: row-reverse; +} table.dataTable thead th.dt-head-justify, table.dataTable thead td.dt-head-justify, table.dataTable tfoot th.dt-head-justify, table.dataTable tfoot td.dt-head-justify { text-align: justify; } +table.dataTable thead th.dt-head-justify div.dt-column-header, +table.dataTable thead th.dt-head-justify div.dt-column-footer, +table.dataTable thead td.dt-head-justify div.dt-column-header, +table.dataTable thead td.dt-head-justify div.dt-column-footer, +table.dataTable tfoot th.dt-head-justify div.dt-column-header, +table.dataTable tfoot th.dt-head-justify div.dt-column-footer, +table.dataTable tfoot td.dt-head-justify div.dt-column-header, +table.dataTable tfoot td.dt-head-justify div.dt-column-footer { + flex-direction: row; +} table.dataTable thead th.dt-head-nowrap, table.dataTable thead td.dt-head-nowrap, table.dataTable tfoot th.dt-head-nowrap, @@ -402,6 +483,9 @@ div.dt-container div.dt-layout-table > div { margin-left: 0; } } +div.dt-container { + position: relative; +} div.dt-container > div.row { margin-bottom: 0.5rem; } @@ -506,14 +590,19 @@ table.dataTable.table-sm > thead > tr td.dt-orderable-asc, table.dataTable.table-sm > thead > tr td.dt-orderable-desc, table.dataTable.table-sm > thead > tr td.dt-ordering-asc, table.dataTable.table-sm > thead > tr td.dt-ordering-desc { - padding-right: 20px; + padding-right: 4px; } table.dataTable.table-sm > thead > tr th.dt-orderable-asc span.dt-column-order, table.dataTable.table-sm > thead > tr th.dt-orderable-desc span.dt-column-order, table.dataTable.table-sm > thead > tr th.dt-ordering-asc span.dt-column-order, table.dataTable.table-sm > thead > tr th.dt-ordering-desc span.dt-column-order, table.dataTable.table-sm > thead > tr td.dt-orderable-asc span.dt-column-order, table.dataTable.table-sm > thead > tr td.dt-orderable-desc span.dt-column-order, table.dataTable.table-sm > thead > tr td.dt-ordering-asc span.dt-column-order, table.dataTable.table-sm > thead > tr td.dt-ordering-desc span.dt-column-order { - right: 5px; + right: 4px; +} +table.dataTable.table-sm > thead > tr th.dt-type-date span.dt-column-order, table.dataTable.table-sm > thead > tr th.dt-type-numeric span.dt-column-order, +table.dataTable.table-sm > thead > tr td.dt-type-date span.dt-column-order, +table.dataTable.table-sm > thead > tr td.dt-type-numeric span.dt-column-order { + left: 4px; } div.dt-scroll-head table.table-bordered { diff --git a/plugins/DataTables/datatables.js b/plugins/DataTables/datatables.js index 87fa0391..82f5c6e0 100644 --- a/plugins/DataTables/datatables.js +++ b/plugins/DataTables/datatables.js @@ -4,13 +4,13 @@ * * To rebuild or modify this file with the latest versions of the included * software please visit: - * https://datatables.net/download/#bs4/dt-2.2.2 + * https://datatables.net/download/#bs4/dt-2.3.1 * * Included libraries: - * DataTables 2.2.2 + * DataTables 2.3.1 */ -/*! DataTables 2.2.2 +/*! DataTables 2.3.1 * © SpryMedia Ltd - datatables.net/license */ @@ -101,15 +101,19 @@ var defaults = DataTable.defaults; var $this = $(this); - - /* Sanity check */ + // Sanity check if ( this.nodeName.toLowerCase() != 'table' ) { _fnLog( null, 0, 'Non-table node initialisation ('+this.nodeName+')', 2 ); return; } - $(this).trigger( 'options.dt', oInit ); + // Special case for options + if (oInit.on && oInit.on.options) { + _fnListener($this, 'options', oInit.on.options); + } + + $this.trigger( 'options.dt', oInit ); /* Backwards compatibility for the defaults */ _fnCompatOpts( defaults ); @@ -248,6 +252,9 @@ "caption", "layout", "orderDescReverse", + "orderIndicators", + "orderHandler", + "titleRow", "typeDetect", [ "iCookieDuration", "iStateDuration" ], // backwards compat [ "oSearch", "oPreviousSearch" ], @@ -276,6 +283,13 @@ oSettings.rowIdFn = _fnGetObjectDataFn( oInit.rowId ); + // Add event listeners + if (oInit.on) { + Object.keys(oInit.on).forEach(function (key) { + _fnListener($this, key, oInit.on[key]); + }); + } + /* Browser support detection */ _fnBrowserDetect( oSettings ); @@ -336,7 +350,7 @@ /* HTML5 attribute detection - build an mData object automatically if the * attributes are found */ - var rowOne = $this.children('tbody').find('tr').eq(0); + var rowOne = $this.children('tbody').find('tr:first-child').eq(0); if ( rowOne.length ) { var a = function ( cell, name ) { @@ -494,6 +508,13 @@ * @namespace */ DataTable.ext = _ext = { + /** + * DataTables build type (expanded by the download builder) + * + * @type string + */ + builder: "bs4/dt-2.3.1", + /** * Buttons. For use with the Buttons extension for DataTables. This is * defined here so other extensions can define buttons regardless of load @@ -505,6 +526,14 @@ buttons: {}, + /** + * ColumnControl buttons and content + * + * @type object + */ + ccContent: {}, + + /** * Element class names * @@ -514,14 +543,6 @@ classes: {}, - /** - * DataTables build type (expanded by the download builder) - * - * @type string - */ - builder: "bs4/dt-2.2.2", - - /** * Error reporting. * @@ -1887,6 +1908,26 @@ init.scrollX = init.scrollX ? '100%' : ''; } + // Objects for ordering + if ( typeof init.bSort === 'object' ) { + init.orderIndicators = init.bSort.indicators !== undefined ? init.bSort.indicators : true; + init.orderHandler = init.bSort.handler !== undefined ? init.bSort.handler : true; + init.bSort = true; + } + else if (init.bSort === false) { + init.orderIndicators = false; + init.orderHandler = false; + } + else if (init.bSort === true) { + init.orderIndicators = true; + init.orderHandler = true; + } + + // Which cells are the title cells? + if (typeof init.bSortCellsTop === 'boolean') { + init.titleRow = init.bSortCellsTop; + } + // Column search objects are in an array, so it needs to be converted // element by element var searchCols = init.aoSearchCols; @@ -3264,7 +3305,7 @@ * @param {*} settings DataTables settings * @param {*} source Source layout array * @param {*} incColumns What columns should be included - * @returns Layout array + * @returns Layout array in column index order */ function _fnHeaderLayout( settings, source, incColumns ) { @@ -3548,7 +3589,9 @@ _fnDraw( settings ); - settings._drawHold = false; + settings.api.one('draw', function () { + settings._drawHold = false; + }); } @@ -3560,10 +3603,9 @@ var zero = oLang.sZeroRecords; var dataSrc = _fnDataSource( settings ); - if ( - (settings.iDraw < 1 && dataSrc === 'ssp') || - (settings.iDraw <= 1 && dataSrc === 'ajax') - ) { + // Make use of the fact that settings.json is only set once the initial data has + // been loaded. Show loading when that isn't the case + if ((dataSrc === 'ssp' || dataSrc === 'ajax') && ! settings.json) { zero = oLang.sLoadingRecords; } else if ( oLang.sEmptyTable && settings.fnRecordsTotal() === 0 ) @@ -3933,6 +3975,7 @@ var rows = $(thead).children('tr'); var row, cell; var i, k, l, iLen, shifted, column, colspan, rowspan; + var titleRow = settings.titleRow; var isHeader = thead && thead.nodeName.toLowerCase() === 'thead'; var layout = []; var unique; @@ -3961,6 +4004,7 @@ cell.nodeName.toUpperCase() == 'TH' ) { var cols = []; + var jqCell = $(cell); // Get the col and rowspan attributes from the DOM and sanitise them colspan = cell.getAttribute('colspan') * 1; @@ -3981,7 +4025,7 @@ if ( write ) { if (unique) { // Allow column options to be set from HTML attributes - _fnColumnOptions( settings, shifted, $(cell).data() ); + _fnColumnOptions( settings, shifted, jqCell.data() ); // Get the width for the column. This can be defined from the // width attribute, style attribute or `columns.width` option @@ -3998,7 +4042,14 @@ // Column title handling - can be user set, or read from the DOM // This happens before the render, so the original is still in place if ( columnDef.sTitle !== null && ! columnDef.autoTitle ) { - cell.innerHTML = columnDef.sTitle; + if ( + (titleRow === true && i === 0) || // top row + (titleRow === false && i === rows.length -1) || // bottom row + (titleRow === i) || // specific row + (titleRow === null) + ) { + cell.innerHTML = columnDef.sTitle; + } } if (! columnDef.sTitle && unique) { @@ -4016,12 +4067,12 @@ // Fall back to the aria-label attribute on the table header if no ariaTitle is // provided. if (! columnDef.ariaTitle) { - columnDef.ariaTitle = $(cell).attr("aria-label") || columnDef.sTitle; + columnDef.ariaTitle = jqCell.attr("aria-label") || columnDef.sTitle; } // Column specific class names if ( columnDef.className ) { - $(cell).addClass( columnDef.className ); + jqCell.addClass( columnDef.className ); } } @@ -4033,11 +4084,28 @@ .appendTo(cell); } - if ( isHeader && $('span.dt-column-order', cell).length === 0) { + if ( + settings.orderIndicators && + isHeader && + jqCell.filter(':not([data-dt-order=disable])').length !== 0 && + jqCell.parent(':not([data-dt-order=disable])').length !== 0 && + $('span.dt-column-order', cell).length === 0 + ) { $('') .addClass('dt-column-order') .appendTo(cell); } + + // We need to wrap the elements in the header in another element to use flexbox + // layout for those elements + var headerFooter = isHeader ? 'header' : 'footer'; + + if ( $('span.dt-column-' + headerFooter, cell).length === 0) { + $('
    ') + .addClass('dt-column-' + headerFooter) + .append(cell.childNodes) + .appendTo(cell); + } } // If there is col / rowspan, copy the information into the layout grid @@ -4188,6 +4256,11 @@ // Allow plug-ins and external processes to modify the data _fnCallbackFire( oSettings, null, 'preXhr', [oSettings, data, baseAjax], true ); + // Custom Ajax option to submit the parameters as a JSON string + if (baseAjax.submitAs === 'json' && typeof data === 'object') { + baseAjax.data = JSON.stringify(data); + } + if ( typeof ajax === 'function' ) { // Is a function - let the caller define what needs to be done @@ -5688,24 +5761,30 @@ function _fnSortInit( settings ) { var target = settings.nTHead; var headerRows = target.querySelectorAll('tr'); - var legacyTop = settings.bSortCellsTop; + var titleRow = settings.titleRow; var notSelector = ':not([data-dt-order="disable"]):not([data-dt-order="icon-only"])'; // Legacy support for `orderCellsTop` - if (legacyTop === true) { + if (titleRow === true) { target = headerRows[0]; } - else if (legacyTop === false) { + else if (titleRow === false) { target = headerRows[ headerRows.length - 1 ]; } + else if (titleRow !== null) { + target = headerRows[titleRow]; + } + // else - all rows - _fnSortAttachListener( - settings, - target, - target === settings.nTHead - ? 'tr'+notSelector+' th'+notSelector+', tr'+notSelector+' td'+notSelector - : 'th'+notSelector+', td'+notSelector - ); + if (settings.orderHandler) { + _fnSortAttachListener( + settings, + target, + target === settings.nTHead + ? 'tr'+notSelector+' th'+notSelector+', tr'+notSelector+' td'+notSelector + : 'th'+notSelector+', td'+notSelector + ); + } // Need to resolve the user input array into our internal structure var order = []; @@ -5720,7 +5799,9 @@ var run = false; var columns = column === undefined ? _fnColumnsFromHeader( e.target ) - : [column]; + : Array.isArray(column) + ? column + : [column]; if ( columns.length ) { for ( var i=0, ien=columns.length ; i= 0 - ? idx - : 0; + if (idx < 0) { + // If the column was not found ignore it and continue + return; + } + + set[0] = idx; } else if (set[0] >= columns.length) { - // If a column name, but it is out of bounds, set to 0 - set[0] = 0; + // If the column index is out of bounds ignore it and continue + return; } settings.aaSorting.push(set); @@ -6765,6 +6849,23 @@ } } + /** + * Add one or more listeners to the table + * + * @param {*} that JQ for the table + * @param {*} name Event name + * @param {*} src Listener(s) + */ + function _fnListener(that, name, src) { + if (!Array.isArray(src)) { + src = [src]; + } + + for (i=0 ; itr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before{position:absolute;display:block;bottom:50%;content:"▲";content:"▲"/""}table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{position:absolute;display:block;top:50%;content:"▼";content:"▼"/""}table.dataTable thead>tr>th.dt-orderable-asc,table.dataTable thead>tr>th.dt-orderable-desc,table.dataTable thead>tr>th.dt-ordering-asc,table.dataTable thead>tr>th.dt-ordering-desc,table.dataTable thead>tr>td.dt-orderable-asc,table.dataTable thead>tr>td.dt-orderable-desc,table.dataTable thead>tr>td.dt-ordering-asc,table.dataTable thead>tr>td.dt-ordering-desc{position:relative;padding-right:30px}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order{position:absolute;right:12px;top:0;bottom:0;width:12px}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:after,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:before,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{left:0;opacity:.125;line-height:9px;font-size:.8em}table.dataTable thead>tr>th.dt-orderable-asc,table.dataTable thead>tr>th.dt-orderable-desc,table.dataTable thead>tr>td.dt-orderable-asc,table.dataTable thead>tr>td.dt-orderable-desc{cursor:pointer}table.dataTable thead>tr>th.dt-orderable-asc:hover,table.dataTable thead>tr>th.dt-orderable-desc:hover,table.dataTable thead>tr>td.dt-orderable-asc:hover,table.dataTable thead>tr>td.dt-orderable-desc:hover{outline:2px solid rgba(0, 0, 0, 0.05);outline-offset:-2px}table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{opacity:.6}table.dataTable thead>tr>th.sorting_desc_disabled span.dt-column-order:after,table.dataTable thead>tr>th.sorting_asc_disabled span.dt-column-order:before,table.dataTable thead>tr>td.sorting_desc_disabled span.dt-column-order:after,table.dataTable thead>tr>td.sorting_asc_disabled span.dt-column-order:before{display:none}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}div.dt-scroll-body>table.dataTable>thead>tr>th,div.dt-scroll-body>table.dataTable>thead>tr>td{overflow:hidden}:root.dark table.dataTable thead>tr>th.dt-orderable-asc:hover,:root.dark table.dataTable thead>tr>th.dt-orderable-desc:hover,:root.dark table.dataTable thead>tr>td.dt-orderable-asc:hover,:root.dark table.dataTable thead>tr>td.dt-orderable-desc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>th.dt-orderable-asc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>th.dt-orderable-desc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>td.dt-orderable-asc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>td.dt-orderable-desc:hover{outline:2px solid rgba(255, 255, 255, 0.05)}div.dt-processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-22px;text-align:center;padding:2px;z-index:10}div.dt-processing>div:last-child{position:relative;width:80px;height:15px;margin:1em auto}div.dt-processing>div:last-child>div{position:absolute;top:0;width:13px;height:13px;border-radius:50%;background:rgb(2, 117, 216);background:rgb(var(--dt-row-selected));animation-timing-function:cubic-bezier(0, 1, 1, 0)}div.dt-processing>div:last-child>div:nth-child(1){left:8px;animation:datatables-loader-1 .6s infinite}div.dt-processing>div:last-child>div:nth-child(2){left:8px;animation:datatables-loader-2 .6s infinite}div.dt-processing>div:last-child>div:nth-child(3){left:32px;animation:datatables-loader-2 .6s infinite}div.dt-processing>div:last-child>div:nth-child(4){left:56px;animation:datatables-loader-3 .6s infinite}@keyframes datatables-loader-1{0%{transform:scale(0)}100%{transform:scale(1)}}@keyframes datatables-loader-3{0%{transform:scale(1)}100%{transform:scale(0)}}@keyframes datatables-loader-2{0%{transform:translate(0, 0)}100%{transform:translate(24px, 0)}}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable th,table.dataTable td{box-sizing:border-box}table.dataTable th.dt-type-numeric,table.dataTable th.dt-type-date,table.dataTable td.dt-type-numeric,table.dataTable td.dt-type-date{text-align:right}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable th.dt-empty,table.dataTable td.dt-empty{text-align:center;vertical-align:top}table.dataTable thead th,table.dataTable thead td,table.dataTable tfoot th,table.dataTable tfoot td{text-align:left}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable.table{clear:both;max-width:none;border-spacing:0;margin-bottom:0}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1){background-color:transparent}table.dataTable.table>tbody>tr{background-color:transparent}table.dataTable.table>tbody>tr.selected>*{box-shadow:inset 0 0 0 9999px rgb(2, 117, 216);box-shadow:inset 0 0 0 9999px rgb(var(--dt-row-selected));color:rgb(255, 255, 255);color:rgb(var(--dt-row-selected-text))}table.dataTable.table>tbody>tr.selected a{color:rgb(9, 10, 11);color:rgb(var(--dt-row-selected-link))}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1)>*{box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-stripe), 0.05)}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1).selected>*{box-shadow:inset 0 0 0 9999px rgba(2, 117, 216, 0.95);box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-selected), 0.95)}table.dataTable.table.table-hover>tbody>tr:hover>*{box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-hover), 0.075)}table.dataTable.table.table-hover>tbody>tr.selected:hover>*{box-shadow:inset 0 0 0 9999px rgba(2, 117, 216, 0.975);box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-selected), 0.975)}div.dt-container div.dt-layout-start>*:not(:last-child){margin-right:1em}div.dt-container div.dt-layout-end>*:not(:first-child){margin-left:1em}div.dt-container div.dt-layout-full{width:100%}div.dt-container div.dt-layout-full>*:only-child{margin-left:auto;margin-right:auto}div.dt-container div.dt-layout-table>div{display:block !important}@media screen and (max-width: 767px){div.dt-container div.dt-layout-start>*:not(:last-child){margin-right:0}div.dt-container div.dt-layout-end>*:not(:first-child){margin-left:0}}div.dt-container>div.row{margin-bottom:.5rem}div.dt-container>div.row:last-child{margin-bottom:0}div.dt-container div.dt-length label{font-weight:normal;text-align:left;white-space:nowrap;margin-bottom:0}div.dt-container div.dt-length select{width:auto;display:inline-block;margin-right:.5em}div.dt-container div.dt-search label{font-weight:normal;white-space:nowrap;text-align:left;margin-bottom:0}div.dt-container div.dt-search input{margin-left:.5em;display:inline-block;width:auto}div.dt-container div.dt-info{white-space:nowrap}div.dt-container div.dt-paging{margin:0}div.dt-container div.dt-paging ul.pagination{margin:0;flex-wrap:wrap}div.dt-container div.dt-processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}div.dt-container div.dt-scroll-body{border-bottom:1px solid #dee2e6}div.dt-container div.dt-scroll-body table,div.dt-container div.dt-scroll-body tbody>tr:last-child>*{border-bottom:none}div.dt-scroll-head table.dataTable{margin-bottom:0 !important}div.dt-scroll-body>table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dt-scroll-body>table thead .dt-orderable-asc:before,div.dt-scroll-body>table thead .dt-orderable-desc:after{display:none}div.dt-scroll-body>table>tbody tr:first-child th,div.dt-scroll-body>table>tbody tr:first-child td{border-top:none}div.dt-scroll-foot>.dt-scroll-footInner{box-sizing:content-box}div.dt-scroll-foot>.dt-scroll-footInner>table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dt-container div.dt-length,div.dt-container div.dt-search,div.dt-container div.dt-info,div.dt-container div.dt-paging{text-align:center}div.dt-container div.row{margin-bottom:0}div.dt-container div.row>*{margin-bottom:.5rem}div.dt-container div.dt-paging ul.pagination{justify-content:center !important}}table.dataTable.table-sm>thead>tr th.dt-orderable-asc,table.dataTable.table-sm>thead>tr th.dt-orderable-desc,table.dataTable.table-sm>thead>tr th.dt-ordering-asc,table.dataTable.table-sm>thead>tr th.dt-ordering-desc,table.dataTable.table-sm>thead>tr td.dt-orderable-asc,table.dataTable.table-sm>thead>tr td.dt-orderable-desc,table.dataTable.table-sm>thead>tr td.dt-ordering-asc,table.dataTable.table-sm>thead>tr td.dt-ordering-desc{padding-right:20px}table.dataTable.table-sm>thead>tr th.dt-orderable-asc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-orderable-desc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-ordering-asc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-ordering-desc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-orderable-asc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-orderable-desc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-ordering-asc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-ordering-desc span.dt-column-order{right:5px}div.dt-scroll-head table.table-bordered{border-bottom-width:0}div.table-responsive>div.dt-container>div.row{margin:0}div.table-responsive>div.dt-container>div.row>div[class^=col-]:first-child{padding-left:0}div.table-responsive>div.dt-container>div.row>div[class^=col-]:last-child{padding-right:0} +:root{--dt-row-selected: 2, 117, 216;--dt-row-selected-text: 255, 255, 255;--dt-row-selected-link: 9, 10, 11;--dt-row-stripe: 0, 0, 0;--dt-row-hover: 0, 0, 0;--dt-column-ordering: 0, 0, 0;--dt-html-background: white}:root.dark{--dt-html-background: rgb(33, 37, 41)}table.dataTable td.dt-control{text-align:center;cursor:pointer}table.dataTable td.dt-control:before{display:inline-block;box-sizing:border-box;content:"";border-top:5px solid transparent;border-left:10px solid rgba(0, 0, 0, 0.5);border-bottom:5px solid transparent;border-right:0px solid transparent}table.dataTable tr.dt-hasChild td.dt-control:before{border-top:10px solid rgba(0, 0, 0, 0.5);border-left:5px solid transparent;border-bottom:0px solid transparent;border-right:5px solid transparent}table.dataTable tfoot:empty{display:none}html.dark table.dataTable td.dt-control:before,:root[data-bs-theme=dark] table.dataTable td.dt-control:before,:root[data-theme=dark] table.dataTable td.dt-control:before{border-left-color:rgba(255, 255, 255, 0.5)}html.dark table.dataTable tr.dt-hasChild td.dt-control:before,:root[data-bs-theme=dark] table.dataTable tr.dt-hasChild td.dt-control:before,:root[data-theme=dark] table.dataTable tr.dt-hasChild td.dt-control:before{border-top-color:rgba(255, 255, 255, 0.5);border-left-color:transparent}div.dt-scroll{width:100%}div.dt-scroll-body thead tr,div.dt-scroll-body tfoot tr{height:0}div.dt-scroll-body thead tr th,div.dt-scroll-body thead tr td,div.dt-scroll-body tfoot tr th,div.dt-scroll-body tfoot tr td{height:0 !important;padding-top:0px !important;padding-bottom:0px !important;border-top-width:0px !important;border-bottom-width:0px !important}div.dt-scroll-body thead tr th div.dt-scroll-sizing,div.dt-scroll-body thead tr td div.dt-scroll-sizing,div.dt-scroll-body tfoot tr th div.dt-scroll-sizing,div.dt-scroll-body tfoot tr td div.dt-scroll-sizing{height:0 !important;overflow:hidden !important}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before{position:absolute;display:block;bottom:50%;content:"▲";content:"▲"/""}table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{position:absolute;display:block;top:50%;content:"▼";content:"▼"/""}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order{position:relative;width:12px;height:20px}table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:after,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:before,table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:after,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:after,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:before,table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{left:0;opacity:.125;line-height:9px;font-size:.8em}table.dataTable thead>tr>th.dt-orderable-asc,table.dataTable thead>tr>th.dt-orderable-desc,table.dataTable thead>tr>td.dt-orderable-asc,table.dataTable thead>tr>td.dt-orderable-desc{cursor:pointer}table.dataTable thead>tr>th.dt-orderable-asc:hover,table.dataTable thead>tr>th.dt-orderable-desc:hover,table.dataTable thead>tr>td.dt-orderable-asc:hover,table.dataTable thead>tr>td.dt-orderable-desc:hover{outline:2px solid rgba(0, 0, 0, 0.05);outline-offset:-2px}table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after,table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before,table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after{opacity:.6}table.dataTable thead>tr>th.sorting_desc_disabled span.dt-column-order:after,table.dataTable thead>tr>th.sorting_asc_disabled span.dt-column-order:before,table.dataTable thead>tr>td.sorting_desc_disabled span.dt-column-order:after,table.dataTable thead>tr>td.sorting_asc_disabled span.dt-column-order:before{display:none}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead>tr>th div.dt-column-header,table.dataTable thead>tr>th div.dt-column-footer,table.dataTable thead>tr>td div.dt-column-header,table.dataTable thead>tr>td div.dt-column-footer,table.dataTable tfoot>tr>th div.dt-column-header,table.dataTable tfoot>tr>th div.dt-column-footer,table.dataTable tfoot>tr>td div.dt-column-header,table.dataTable tfoot>tr>td div.dt-column-footer{display:flex;justify-content:space-between;align-items:center;gap:4px}table.dataTable thead>tr>th div.dt-column-header span.dt-column-title,table.dataTable thead>tr>th div.dt-column-footer span.dt-column-title,table.dataTable thead>tr>td div.dt-column-header span.dt-column-title,table.dataTable thead>tr>td div.dt-column-footer span.dt-column-title,table.dataTable tfoot>tr>th div.dt-column-header span.dt-column-title,table.dataTable tfoot>tr>th div.dt-column-footer span.dt-column-title,table.dataTable tfoot>tr>td div.dt-column-header span.dt-column-title,table.dataTable tfoot>tr>td div.dt-column-footer span.dt-column-title{flex-grow:1}table.dataTable thead>tr>th div.dt-column-header span.dt-column-title:empty,table.dataTable thead>tr>th div.dt-column-footer span.dt-column-title:empty,table.dataTable thead>tr>td div.dt-column-header span.dt-column-title:empty,table.dataTable thead>tr>td div.dt-column-footer span.dt-column-title:empty,table.dataTable tfoot>tr>th div.dt-column-header span.dt-column-title:empty,table.dataTable tfoot>tr>th div.dt-column-footer span.dt-column-title:empty,table.dataTable tfoot>tr>td div.dt-column-header span.dt-column-title:empty,table.dataTable tfoot>tr>td div.dt-column-footer span.dt-column-title:empty{display:none}div.dt-scroll-body>table.dataTable>thead>tr>th,div.dt-scroll-body>table.dataTable>thead>tr>td{overflow:hidden}:root.dark table.dataTable thead>tr>th.dt-orderable-asc:hover,:root.dark table.dataTable thead>tr>th.dt-orderable-desc:hover,:root.dark table.dataTable thead>tr>td.dt-orderable-asc:hover,:root.dark table.dataTable thead>tr>td.dt-orderable-desc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>th.dt-orderable-asc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>th.dt-orderable-desc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>td.dt-orderable-asc:hover,:root[data-bs-theme=dark] table.dataTable thead>tr>td.dt-orderable-desc:hover{outline:2px solid rgba(255, 255, 255, 0.05)}div.dt-processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-22px;text-align:center;padding:2px;z-index:10}div.dt-processing>div:last-child{position:relative;width:80px;height:15px;margin:1em auto}div.dt-processing>div:last-child>div{position:absolute;top:0;width:13px;height:13px;border-radius:50%;background:rgb(2, 117, 216);background:rgb(var(--dt-row-selected));animation-timing-function:cubic-bezier(0, 1, 1, 0)}div.dt-processing>div:last-child>div:nth-child(1){left:8px;animation:datatables-loader-1 .6s infinite}div.dt-processing>div:last-child>div:nth-child(2){left:8px;animation:datatables-loader-2 .6s infinite}div.dt-processing>div:last-child>div:nth-child(3){left:32px;animation:datatables-loader-2 .6s infinite}div.dt-processing>div:last-child>div:nth-child(4){left:56px;animation:datatables-loader-3 .6s infinite}@keyframes datatables-loader-1{0%{transform:scale(0)}100%{transform:scale(1)}}@keyframes datatables-loader-3{0%{transform:scale(1)}100%{transform:scale(0)}}@keyframes datatables-loader-2{0%{transform:translate(0, 0)}100%{transform:translate(24px, 0)}}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable th,table.dataTable td{box-sizing:border-box}table.dataTable th.dt-type-numeric,table.dataTable th.dt-type-date,table.dataTable td.dt-type-numeric,table.dataTable td.dt-type-date{text-align:right}table.dataTable th.dt-type-numeric div.dt-column-header,table.dataTable th.dt-type-numeric div.dt-column-footer,table.dataTable th.dt-type-date div.dt-column-header,table.dataTable th.dt-type-date div.dt-column-footer,table.dataTable td.dt-type-numeric div.dt-column-header,table.dataTable td.dt-type-numeric div.dt-column-footer,table.dataTable td.dt-type-date div.dt-column-header,table.dataTable td.dt-type-date div.dt-column-footer{flex-direction:row-reverse}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-left div.dt-column-header,table.dataTable th.dt-left div.dt-column-footer,table.dataTable td.dt-left div.dt-column-header,table.dataTable td.dt-left div.dt-column-footer{flex-direction:row}table.dataTable th.dt-center,table.dataTable td.dt-center{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-right div.dt-column-header,table.dataTable th.dt-right div.dt-column-footer,table.dataTable td.dt-right div.dt-column-header,table.dataTable td.dt-right div.dt-column-footer{flex-direction:row-reverse}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-justify div.dt-column-header,table.dataTable th.dt-justify div.dt-column-footer,table.dataTable td.dt-justify div.dt-column-header,table.dataTable td.dt-justify div.dt-column-footer{flex-direction:row}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable th.dt-empty,table.dataTable td.dt-empty{text-align:center;vertical-align:top}table.dataTable thead th,table.dataTable thead td,table.dataTable tfoot th,table.dataTable tfoot td{text-align:left}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-left div.dt-column-header,table.dataTable thead th.dt-head-left div.dt-column-footer,table.dataTable thead td.dt-head-left div.dt-column-header,table.dataTable thead td.dt-head-left div.dt-column-footer,table.dataTable tfoot th.dt-head-left div.dt-column-header,table.dataTable tfoot th.dt-head-left div.dt-column-footer,table.dataTable tfoot td.dt-head-left div.dt-column-header,table.dataTable tfoot td.dt-head-left div.dt-column-footer{flex-direction:row}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-right div.dt-column-header,table.dataTable thead th.dt-head-right div.dt-column-footer,table.dataTable thead td.dt-head-right div.dt-column-header,table.dataTable thead td.dt-head-right div.dt-column-footer,table.dataTable tfoot th.dt-head-right div.dt-column-header,table.dataTable tfoot th.dt-head-right div.dt-column-footer,table.dataTable tfoot td.dt-head-right div.dt-column-header,table.dataTable tfoot td.dt-head-right div.dt-column-footer{flex-direction:row-reverse}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-justify div.dt-column-header,table.dataTable thead th.dt-head-justify div.dt-column-footer,table.dataTable thead td.dt-head-justify div.dt-column-header,table.dataTable thead td.dt-head-justify div.dt-column-footer,table.dataTable tfoot th.dt-head-justify div.dt-column-header,table.dataTable tfoot th.dt-head-justify div.dt-column-footer,table.dataTable tfoot td.dt-head-justify div.dt-column-header,table.dataTable tfoot td.dt-head-justify div.dt-column-footer{flex-direction:row}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable.table{clear:both;max-width:none;border-spacing:0;margin-bottom:0}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1){background-color:transparent}table.dataTable.table>tbody>tr{background-color:transparent}table.dataTable.table>tbody>tr.selected>*{box-shadow:inset 0 0 0 9999px rgb(2, 117, 216);box-shadow:inset 0 0 0 9999px rgb(var(--dt-row-selected));color:rgb(255, 255, 255);color:rgb(var(--dt-row-selected-text))}table.dataTable.table>tbody>tr.selected a{color:rgb(9, 10, 11);color:rgb(var(--dt-row-selected-link))}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1)>*{box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-stripe), 0.05)}table.dataTable.table.table-striped>tbody>tr:nth-of-type(2n+1).selected>*{box-shadow:inset 0 0 0 9999px rgba(2, 117, 216, 0.95);box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-selected), 0.95)}table.dataTable.table.table-hover>tbody>tr:hover>*{box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-hover), 0.075)}table.dataTable.table.table-hover>tbody>tr.selected:hover>*{box-shadow:inset 0 0 0 9999px rgba(2, 117, 216, 0.975);box-shadow:inset 0 0 0 9999px rgba(var(--dt-row-selected), 0.975)}div.dt-container div.dt-layout-start>*:not(:last-child){margin-right:1em}div.dt-container div.dt-layout-end>*:not(:first-child){margin-left:1em}div.dt-container div.dt-layout-full{width:100%}div.dt-container div.dt-layout-full>*:only-child{margin-left:auto;margin-right:auto}div.dt-container div.dt-layout-table>div{display:block !important}@media screen and (max-width: 767px){div.dt-container div.dt-layout-start>*:not(:last-child){margin-right:0}div.dt-container div.dt-layout-end>*:not(:first-child){margin-left:0}}div.dt-container{position:relative}div.dt-container>div.row{margin-bottom:.5rem}div.dt-container>div.row:last-child{margin-bottom:0}div.dt-container div.dt-length label{font-weight:normal;text-align:left;white-space:nowrap;margin-bottom:0}div.dt-container div.dt-length select{width:auto;display:inline-block;margin-right:.5em}div.dt-container div.dt-search label{font-weight:normal;white-space:nowrap;text-align:left;margin-bottom:0}div.dt-container div.dt-search input{margin-left:.5em;display:inline-block;width:auto}div.dt-container div.dt-info{white-space:nowrap}div.dt-container div.dt-paging{margin:0}div.dt-container div.dt-paging ul.pagination{margin:0;flex-wrap:wrap}div.dt-container div.dt-processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}div.dt-container div.dt-scroll-body{border-bottom:1px solid #dee2e6}div.dt-container div.dt-scroll-body table,div.dt-container div.dt-scroll-body tbody>tr:last-child>*{border-bottom:none}div.dt-scroll-head table.dataTable{margin-bottom:0 !important}div.dt-scroll-body>table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dt-scroll-body>table thead .dt-orderable-asc:before,div.dt-scroll-body>table thead .dt-orderable-desc:after{display:none}div.dt-scroll-body>table>tbody tr:first-child th,div.dt-scroll-body>table>tbody tr:first-child td{border-top:none}div.dt-scroll-foot>.dt-scroll-footInner{box-sizing:content-box}div.dt-scroll-foot>.dt-scroll-footInner>table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dt-container div.dt-length,div.dt-container div.dt-search,div.dt-container div.dt-info,div.dt-container div.dt-paging{text-align:center}div.dt-container div.row{margin-bottom:0}div.dt-container div.row>*{margin-bottom:.5rem}div.dt-container div.dt-paging ul.pagination{justify-content:center !important}}table.dataTable.table-sm>thead>tr th.dt-orderable-asc,table.dataTable.table-sm>thead>tr th.dt-orderable-desc,table.dataTable.table-sm>thead>tr th.dt-ordering-asc,table.dataTable.table-sm>thead>tr th.dt-ordering-desc,table.dataTable.table-sm>thead>tr td.dt-orderable-asc,table.dataTable.table-sm>thead>tr td.dt-orderable-desc,table.dataTable.table-sm>thead>tr td.dt-ordering-asc,table.dataTable.table-sm>thead>tr td.dt-ordering-desc{padding-right:4px}table.dataTable.table-sm>thead>tr th.dt-orderable-asc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-orderable-desc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-ordering-asc span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-ordering-desc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-orderable-asc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-orderable-desc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-ordering-asc span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-ordering-desc span.dt-column-order{right:4px}table.dataTable.table-sm>thead>tr th.dt-type-date span.dt-column-order,table.dataTable.table-sm>thead>tr th.dt-type-numeric span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-type-date span.dt-column-order,table.dataTable.table-sm>thead>tr td.dt-type-numeric span.dt-column-order{left:4px}div.dt-scroll-head table.table-bordered{border-bottom-width:0}div.table-responsive>div.dt-container>div.row{margin:0}div.table-responsive>div.dt-container>div.row>div[class^=col-]:first-child{padding-left:0}div.table-responsive>div.dt-container>div.row>div[class^=col-]:last-child{padding-right:0} diff --git a/plugins/DataTables/datatables.min.js b/plugins/DataTables/datatables.min.js index 30f182d0..e0967512 100644 --- a/plugins/DataTables/datatables.min.js +++ b/plugins/DataTables/datatables.min.js @@ -4,16 +4,16 @@ * * To rebuild or modify this file with the latest versions of the included * software please visit: - * https://datatables.net/download/#bs4/dt-2.2.2 + * https://datatables.net/download/#bs4/dt-2.3.1 * * Included libraries: - * DataTables 2.2.2 + * DataTables 2.3.1 */ -/*! DataTables 2.2.2 +/*! DataTables 2.3.1 * © SpryMedia Ltd - datatables.net/license */ -!function(n){"use strict";var r;"function"==typeof define&&define.amd?define(["jquery"],function(e){return n(e,window,document)}):"object"==typeof exports?(r=require("jquery"),"undefined"==typeof window?module.exports=function(e,t){return e=e||window,t=t||r(e),n(t,e,e.document)}:module.exports=n(r,window,window.document)):window.DataTable=n(jQuery,window,document)}(function(H,W,S){"use strict";function f(e){var t=parseInt(e,10);return!isNaN(t)&&isFinite(e)?t:null}function s(e,t,n,r){var a=typeof e,o="string"==a;return"number"==a||"bigint"==a||!(!r||!_(e))||(t&&o&&(e=E(e,t)),n&&o&&(e=e.replace(P,"")),!isNaN(parseFloat(e))&&isFinite(e))}function c(e,t,n,r){var a;return!(!r||!_(e))||("string"!=typeof e||!e.match(/<(input|select)/i))&&(_(a=e)||"string"==typeof a)&&!!s(w(e),t,n,r)||null}function m(e,t,n,r){var a=[],o=0,i=t.length;if(void 0!==r)for(;o").prependTo(this),fastData:function(e,t,n){return q(c,e,t,n)}}),n=(c.nTable=this,c.oInit=e,o.push(c),c.api=new X(c),c.oInstance=1===E.length?E:a.dataTable(),Q(e),e.aLengthMenu&&!e.iDisplayLength&&(e.iDisplayLength=Array.isArray(e.aLengthMenu[0])?e.aLengthMenu[0][0]:H.isPlainObject(e.aLengthMenu[0])?e.aLengthMenu[0].value:e.aLengthMenu[0]),e=tt(H.extend(!0,{},r),e),$(c.oFeatures,e,["bPaginate","bLengthChange","bFilter","bSort","bSortMulti","bInfo","bProcessing","bAutoWidth","bSortClasses","bServerSide","bDeferRender"]),$(c,e,["ajax","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","iStateDuration","bSortCellsTop","iTabIndex","sDom","fnStateLoadCallback","fnStateSaveCallback","renderer","searchDelay","rowId","caption","layout","orderDescReverse","typeDetect",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"]]),$(c.oScroll,e,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]),$(c.oLanguage,e,"fnInfoCallback"),Y(c,"aoDrawCallback",e.fnDrawCallback),Y(c,"aoStateSaveParams",e.fnStateSaveParams),Y(c,"aoStateLoadParams",e.fnStateLoadParams),Y(c,"aoStateLoaded",e.fnStateLoaded),Y(c,"aoRowCallback",e.fnRowCallback),Y(c,"aoRowCreatedCallback",e.fnCreatedRow),Y(c,"aoHeaderCallback",e.fnHeaderCallback),Y(c,"aoFooterCallback",e.fnFooterCallback),Y(c,"aoInitComplete",e.fnInitComplete),Y(c,"aoPreDrawCallback",e.fnPreDrawCallback),c.rowIdFn=U(e.rowId),c),d=(V.__browser||(f={},V.__browser=f,p=H("
    ").css({position:"fixed",top:0,left:-1*W.pageXOffset,height:1,width:1,overflow:"hidden"}).append(H("
    ").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(H("
    ").css({width:"100%",height:10}))).appendTo("body"),d=p.children(),u=d.children(),f.barWidth=d[0].offsetWidth-d[0].clientWidth,f.bScrollbarLeft=1!==Math.round(u.offset().left),p.remove()),H.extend(n.oBrowser,V.__browser),n.oScroll.iBarWidth=V.__browser.barWidth,c.oClasses),f=(H.extend(d,V.ext.classes,e.oClasses),a.addClass(d.table),c.oFeatures.bPaginate||(e.iDisplayStart=0),void 0===c.iInitDisplayStart&&(c.iInitDisplayStart=e.iDisplayStart,c._iDisplayStart=e.iDisplayStart),e.iDeferLoading),h=(null!==f&&(c.deferLoading=!0,u=Array.isArray(f),c._iRecordsDisplay=u?f[0]:f,c._iRecordsTotal=u?f[1]:f),[]),p=this.getElementsByTagName("thead"),n=Ae(c,p[0]);if(e.aoColumns)h=e.aoColumns;else if(n.length)for(j=n[t=0].length;t").appendTo(a):n).html(c.caption),n.length&&(n[0]._captionSide=n.css("caption-side"),c.captionNode=n[0]),0===p.length&&(p=H("
    - "> + text-nowrap"> - - - diff --git a/recurring_invoice.php b/recurring_invoice.php index 34271cd1..77419bfb 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -45,6 +45,7 @@ if (isset($_GET['recurring_invoice_id'])) { $location_city = nullable_htmlentities($row['location_city']); $location_state = nullable_htmlentities($row['location_state']); $location_zip = nullable_htmlentities($row['location_zip']); + $location_country = nullable_htmlentities($row['location_country']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); @@ -194,6 +195,7 @@ if (isset($_GET['recurring_invoice_id'])) {

    • +
    • @@ -203,6 +205,7 @@ if (isset($_GET['recurring_invoice_id'])) {

    • +
    • @@ -272,29 +275,24 @@ if (isset($_GET['recurring_invoice_id'])) {
    diff --git a/recurring_expenses.php b/recurring_expenses.php index 33ebad6f..6743df79 100644 --- a/recurring_expenses.php +++ b/recurring_expenses.php @@ -32,7 +32,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Recurring Expenses

    - +
    @@ -94,19 +94,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Next Date     		- - Vendor - - Category + / + + Description + - - Description + + Vendor @@ -192,9 +191,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    +
    -
    -
    - +
    + -
    -
    - -
    - -
    - - Edit - -
    - Delete -
    +
    + + Edit + +
    + Delete
    diff --git a/recurring_invoices.php b/recurring_invoices.php index 2df9bf03..3a3dc282 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -47,7 +47,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    Recurring Invoices

    - +
    @@ -59,7 +59,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    @@ -69,7 +69,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    ">Active ">Inactive
    @@ -112,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> + text-nowrap">
    diff --git a/recurring_tickets.php b/recurring_tickets.php index 246eb073..af3edf25 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -60,7 +60,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -108,9 +108,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - "> + text-nowrap">
    diff --git a/revenues.php b/revenues.php index 3ddfe322..fca0d1ce 100644 --- a/revenues.php +++ b/revenues.php @@ -82,7 +82,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> + text-nowrap">
    diff --git a/scripts/cron.php b/scripts/cron.php index 3c838824..ec11395f 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -334,7 +334,7 @@ if (mysqli_num_rows($sql_recurring_tickets) > 0) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Raise the ticket - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_recurring_ticket_id = $recurring_ticket_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Recurring', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_recurring_ticket_id = $recurring_ticket_id"); $id = mysqli_insert_id($mysqli); // Copy Additional Assets from Recurring ticket to new ticket diff --git a/scripts/cron_mail_queue.php b/scripts/cron_mail_queue.php index 87e52447..304b84a8 100644 --- a/scripts/cron_mail_queue.php +++ b/scripts/cron_mail_queue.php @@ -43,16 +43,16 @@ if (file_exists($lock_file_path)) { // If file is older than 10 minutes (600 seconds), delete and continue if ($file_age > 600) { - + unlink($lock_file_path); // Logging - logApp("Cron-Mail-Queue", "Delete", "Cron Mail Queue detected a lock file was present but was over 10 minutes old so it removed it."); + logApp("Cron-Mail-Queue", "warning", "Cron Mail Queue detected a lock file was present but was over 10 minutes old so it removed it."); } else { - + // Logging - logApp("Cron-Mail-Queue", "Locked", "Cron Mail Queue attempted to execute but was already executing so instead it terminated."); - + logApp("Cron-Mail-Queue", "info", "Cron Mail Queue attempted to execute but was already executing so instead it terminated."); + exit("Script is already running. Exiting."); } } @@ -129,9 +129,9 @@ if (mysqli_num_rows($sql_queue) > 0) { // Update Message - Success mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = 1 WHERE email_id = $email_id"); } - + } else { - + // Recipient email isn't valid, mark as failed and log the error mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_attempts = 99 WHERE email_id = $email_id"); @@ -147,7 +147,7 @@ if (mysqli_num_rows($sql_queue) > 0) { // Logging logApp("Cron-Mail-Queue", "Error", "Failed to send email #$email_id due to invalid sender address: $email_from_logging - check configuration in settings."); - + appNotify("Mail", "Failed to send email #$email_id due to invalid sender address"); } @@ -210,12 +210,12 @@ if (mysqli_num_rows($sql_failed_queue) > 0) { // Logging logApp("Cron-Mail-Queue", "Error", "Failed to re-send email #$email_id to $email_recipient_logging regarding $email_subject_logging. $mail"); - + } else { - + // Update Message mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id"); - + } } } diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php index d558549c..46e73ec9 100644 --- a/scripts/cron_ticket_email_parser.php +++ b/scripts/cron_ticket_email_parser.php @@ -110,7 +110,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date //Generate a unique URL key for clients to access $url_key = randomString(156); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$ticket_prefix_esc', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$message_esc', ticket_priority = 'Low', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', ticket_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$ticket_prefix_esc', ticket_number = $ticket_number, ticket_source = 'Email', ticket_subject = '$subject', ticket_details = '$message_esc', ticket_priority = 'Low', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', ticket_client_id = $client_id"); $id = mysqli_insert_id($mysqli); // Logging diff --git a/setup.php b/setup.php index 0b46651c..db7de36e 100644 --- a/setup.php +++ b/setup.php @@ -6,10 +6,8 @@ if (file_exists("config.php")) { } include "functions.php"; - include "includes/database_version.php"; - if (!isset($config_enable_setup)) { $config_enable_setup = 1; } @@ -19,6 +17,24 @@ if ($config_enable_setup == 0) { exit; } +$mysqli_available = isset($mysqli) && $mysqli instanceof mysqli; +$can_show_restore = false; +$should_skip_to_user = false; + +if (file_exists("config.php") && $mysqli_available) { + $table_result = mysqli_query($mysqli, "SHOW TABLES LIKE 'users'"); + if ($table_result && mysqli_num_rows($table_result) > 0) { + $can_show_restore = true; + $should_skip_to_user = true; + } else { + // If DB exists but doesn't have user table yet, maybe still allow restore + $all_tables = mysqli_query($mysqli, "SHOW TABLES"); + if ($all_tables && mysqli_num_rows($all_tables) > 0) { + $can_show_restore = true; + } + } +} + include_once "includes/settings_localization_array.php"; $errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; @@ -109,6 +125,118 @@ if (isset($_POST['add_database'])) { } +if (isset($_POST['restore'])) { + + if (!isset($_FILES['backup_zip']) || $_FILES['backup_zip']['error'] !== UPLOAD_ERR_OK) { + die("No backup file uploaded or upload failed."); + } + + $file = $_FILES['backup_zip']; + $fileExt = strtolower(pathinfo($file['name'], PATHINFO_EXTENSION)); + if ($fileExt !== "zip") { + die("Only .zip files are allowed."); + } + + // Save uploaded file temporarily + $backupZip = "restore_" . time() . ".zip"; + if (!move_uploaded_file($file["tmp_name"], $backupZip)) { + die("Failed to save uploaded backup file."); + } + + $zip = new ZipArchive; + if ($zip->open($backupZip) !== TRUE) { + unlink($backupZip); + die("Failed to open backup zip file."); + } + + // Extract to a temp directory + $tempDir = "restore_temp_" . time(); + mkdir($tempDir); + + if (!$zip->extractTo($tempDir)) { + $zip->close(); + unlink($backupZip); + die("Failed to extract backup contents."); + } + $zip->close(); + unlink($backupZip); + + // === 1. Restore SQL Dump === + $sqlPath = "$tempDir/db.sql"; + if (file_exists($sqlPath)) { + mysqli_query($mysqli, "SET foreign_key_checks = 0"); + $tables = mysqli_query($mysqli, "SHOW TABLES"); + while ($row = mysqli_fetch_array($tables)) { + mysqli_query($mysqli, "DROP TABLE IF EXISTS `" . $row[0] . "`"); + } + mysqli_query($mysqli, "SET foreign_key_checks = 1"); + + $command = sprintf( + 'mysql -h%s -u%s -p%s %s < %s', + escapeshellarg($dbhost), + escapeshellarg($dbusername), + escapeshellarg($dbpassword), + escapeshellarg($database), + escapeshellarg($sqlPath) + ); + + exec($command, $output, $returnCode); + if ($returnCode !== 0) { + die("SQL import failed. Error code: $returnCode"); + } + } else { + die("Missing db.sql in the backup archive."); + } + + // === 2. Restore Upload Folder === + $uploadDir = __DIR__ . "/uploads/"; + $uploadsZip = "$tempDir/uploads.zip"; + + if (file_exists($uploadsZip)) { + $uploads = new ZipArchive; + if ($uploads->open($uploadsZip) === TRUE) { + // Clean existing uploads + foreach (glob($uploadDir . '*') as $item) { + if (is_dir($item)) { + array_map('unlink', glob("$item/*")); + rmdir($item); + } else { + unlink($item); + } + } + + $uploads->extractTo($uploadDir); + $uploads->close(); + } else { + die("Failed to open uploads.zip in backup."); + } + } else { + die("Missing uploads.zip in the backup archive."); + } + + // === 3. Read version.txt (optional log/display) + $versionTxt = "$tempDir/version.txt"; + if (file_exists($versionTxt)) { + $versionInfo = file_get_contents($versionTxt); + // You could log it, show it, or ignore it + // e.g. logAction("Backup Restore", "Version Info", $versionInfo); + } + + // Cleanup temp restore directory + array_map('unlink', glob("$tempDir/*")); + rmdir($tempDir); + + // === 4. Final Setup Stages === + $myfile = fopen("config.php", "a"); + $txt = "\$config_enable_setup = 0;\n\n"; + fwrite($myfile, $txt); + fclose($myfile); + + $_SESSION['alert_message'] = "Full backup restored successfully."; + header("Location: login.php"); + exit; +} + if (isset($_POST['add_user'])) { $user_count = mysqli_num_rows(mysqli_query($mysqli,"SELECT COUNT(*) FROM users")); if ($user_count < 0) { @@ -146,7 +274,7 @@ if (isset($_POST['add_user'])) { $new_file_name = md5(time() . $file_name) . '.' . $file_extension; // check if file has one of the following extensions - $allowed_file_extensions = array('jpg', 'gif', 'png'); + $allowed_file_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp'); if (in_array($file_extension,$allowed_file_extensions) === false) { $file_error = 1; @@ -195,9 +323,6 @@ if (isset($_POST['add_company_settings'])) { $phone = preg_replace("/[^0-9]/", '',$_POST['phone']); $email = sanitizeInput($_POST['email']); $website = sanitizeInput($_POST['website']); - $locale = sanitizeInput($_POST['locale']); - $currency_code = sanitizeInput($_POST['currency_code']); - $timezone = sanitizeInput($_POST['timezone']); mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code'"); @@ -287,7 +412,6 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Event', category_type = 'Referral', category_color = 'red'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Affiliate', category_type = 'Referral', category_color = 'pink'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Client', category_type = 'Referral', category_color = 'lightblue'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Influencer', category_type = 'Referral', category_color = 'turquoise'"); // Payment Methods mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); @@ -477,42 +601,58 @@ if (isset($_POST['add_telemetry'])) {