From bd31513e5db8ef82c98a13f74af38ccf7139fe48 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 22 Jun 2025 09:59:23 +0100 Subject: [PATCH 001/244] Add db fields for ticket_quote --- database_updates.php | 32 ++++++++++++++++++-------------- db.sql | 3 ++- includes/database_version.php | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/database_updates.php b/database_updates.php index 33bf60a3..dc8374b0 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2776,7 +2776,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { //Dropping patch panel as a patch panel can be documented as an asset with interfaces. mysqli_query($mysqli, "DROP TABLE `patch_panel_ports`"); mysqli_query($mysqli, "DROP TABLE `patch_panels`"); - + mysqli_query($mysqli, "RENAME TABLE `events` TO `calendar_events`"); mysqli_query($mysqli, "RENAME TABLE `event_attendees` TO `calendar_event_attendees`"); @@ -2957,7 +2957,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ALTER TABLE `calendar_events` ADD FOREIGN KEY (`event_calendar_id`) REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE "); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.3'"); } @@ -2974,7 +2974,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ALTER TABLE `certificate_history` ADD FOREIGN KEY (`certificate_history_certificate_id`) REFERENCES `certificates`(`certificate_id`) ON DELETE CASCADE "); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.4'"); } @@ -3335,14 +3335,14 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE, ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE "); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.5'"); } if (CURRENT_DATABASE_VERSION == '2.0.5') { // CONVERT All tables TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci - + $tables = [ 'accounts', 'api_keys', 'app_logs', 'asset_credentials', 'asset_custom', 'asset_documents', 'asset_files', 'asset_history', 'asset_interface_links', 'asset_interfaces', 'asset_notes', 'assets', @@ -3381,14 +3381,14 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '2.0.7') { - + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_hash`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.8'"); } if (CURRENT_DATABASE_VERSION == '2.0.8') { - + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_has_thumbnail`"); mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_has_preview`"); mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_asset_id`"); @@ -3397,7 +3397,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '2.0.9') { - + mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_phone_country_code` VARCHAR(10) DEFAULT 1 AFTER `contact_email`"); mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_mobile_country_code` VARCHAR(10) DEFAULT 1 AFTER `contact_extension`"); @@ -3425,7 +3425,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '2.1.2') { - + // Update country_code to NULL for `contacts` table mysqli_query($mysqli, "ALTER TABLE `contacts` MODIFY `contact_phone_country_code` VARCHAR(10) DEFAULT NULL"); mysqli_query($mysqli, "ALTER TABLE `contacts` MODIFY `contact_mobile_country_code` VARCHAR(10) DEFAULT NULL"); @@ -3460,7 +3460,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { 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'"); } @@ -3675,13 +3675,17 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.0'"); } - // if (CURRENT_DATABASE_VERSION == '2.2.0') { - // // Insert queries here required to update to DB version 2.2.1 + if (CURRENT_DATABASE_VERSION == '2.2.0') { + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_quote_id` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_asset_id`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.2.1') { + // // Insert queries here required to update to DB version 2.2.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.2'"); // } } else { // Up-to-date } - \ No newline at end of file diff --git a/db.sql b/db.sql index 651117df..d02d3ea2 100644 --- a/db.sql +++ b/db.sql @@ -1,4 +1,4 @@ -/*M!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ -- MariaDB dump 10.19 Distrib 10.11.11-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: itflow_dev @@ -2318,6 +2318,7 @@ CREATE TABLE `tickets` ( `ticket_contact_id` int(11) NOT NULL DEFAULT 0, `ticket_location_id` int(11) NOT NULL DEFAULT 0, `ticket_asset_id` int(11) NOT NULL DEFAULT 0, + `ticket_quote_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, `ticket_recurring_ticket_id` int(11) DEFAULT 0, diff --git a/includes/database_version.php b/includes/database_version.php index 19e5f1d6..5ade9c63 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.0"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.1"); From 2ca50776ec2aa5af0272d3835af3a48ace5faed2 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 22 Jun 2025 10:00:53 +0100 Subject: [PATCH 002/244] Ticket - Move ticket metadata/details into their own card (source, category, time, closure details, etc) - Start adding support for ticket_quote --- ticket.php | 213 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 142 insertions(+), 71 deletions(-) diff --git a/ticket.php b/ticket.php index b2b56e99..df7bfba3 100644 --- a/ticket.php +++ b/ticket.php @@ -34,6 +34,7 @@ if (isset($_GET['ticket_id'])) { LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 LEFT JOIN vendors ON ticket_vendor_id = vendor_id LEFT JOIN projects ON ticket_project_id = project_id + LEFT JOIN quotes ON ticket_quote_id = quote_id LEFT JOIN invoices ON ticket_invoice_id = invoice_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN categories ON ticket_category = category_id @@ -104,13 +105,15 @@ if (isset($_GET['ticket_id'])) { $ticket_updated_at_ago = timeAgo($row['ticket_updated_at']); $ticket_resolved_at = nullable_htmlentities($row['ticket_resolved_at']); $ticket_resolved_at_ago = timeAgo($row['ticket_resolved_at']); + $ticket_resolved_date = date('Y-m-d', strtotime($ticket_resolved_at)); $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); $ticket_closed_at_ago = timeAgo($row['ticket_closed_at']); + $ticket_closed_date = date('Y-m-d', strtotime($ticket_closed_at)); $ticket_closed_by = intval($row['ticket_closed_by']); $ticket_assigned_to = intval($row['ticket_assigned_to']); if (empty($ticket_assigned_to)) { - $ticket_assigned_to_display = "Not Assigned"; + $ticket_assigned_to_display = "Not Assigned"; } else { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } @@ -163,6 +166,11 @@ if (isset($_GET['ticket_id'])) { $location_zip = nullable_htmlentities($row['location_zip']); $location_phone = formatPhoneNumber($row['location_phone']); + $quote_id = intval($row['ticket_quote_id']); + $quote_prefix = nullable_htmlentities($row['quote_prefix']); + $quote_number = intval($row['quote_number']); + $quote_created_at = nullable_htmlentities($row['quote_created_at']); + $invoice_id = intval($row['ticket_invoice_id']); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -181,7 +189,7 @@ if (isset($_GET['ticket_id'])) { $row = mysqli_fetch_array($sql_project_manager); $project_manager_name = nullable_htmlentities($row['user_name']); } - + if ($contact_id) { //Get Contact Ticket Stats $ticket_related_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_related_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_contact_id = $contact_id "); @@ -472,39 +480,12 @@ if (isset($_GET['ticket_id'])) {
-
- -
Updated:
- - -
- Closed by: -
-
- Closed at: -
-
- -
- -
- Feedback: -
- - + +
+ +
+ +
- + +
@@ -530,21 +516,29 @@ if (isset($_GET['ticket_id'])) {
- + + +
Scheduled:
- + - // Billable - if ($config_module_enable_accounting) { ?> - = 1) { ?> + + = 1) { ?> + +
- Invoiced: + Quoted:
- = 1) { ?> + + + +
+ Invoiced: +
+
Ticket is
- - + + + + +
- Tasks Completed% + Tasks Completed + %
/
- -
- Total time worked: -
- - - -
- -
- - - 0) { ?> -
- -
- -
@@ -660,7 +638,7 @@ if (isset($_GET['ticket_id'])) {
- +
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ value="1" id="billable"> + +
+
+ + + + + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ To-do: project, etc. + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+ + + + + +
+ + +
+ + + + + + + + + + + + + + diff --git a/tickets.php b/tickets.php index f8cd8bb7..89429b1a 100644 --- a/tickets.php +++ b/tickets.php @@ -166,7 +166,7 @@ $sql_categories = mysqli_query( = 2) { ?>
- 0) { ?> @@ -438,6 +438,6 @@ if (isset($_GET["view"])) { Date: Mon, 30 Jun 2025 14:41:12 +0200 Subject: [PATCH 031/244] - Enhanced the document retrieval process by including the document description in the SQL query. - Implemented file upload capabilities, allowing users to attach files to documents with support for various formats (PDF, Word, text). - Created modals for adding new documents and uploading files, improving user experience. - Added functions for formatting file sizes and retrieving appropriate icons based on file extensions. - Updated the document display logic to handle attached files, providing inline previews for PDFs and images. --- client/document.php | 144 +++++++++++++++++++++++++++++++++++++++++-- client/documents.php | 127 +++++++++++++++++++++++++++++++++++--- client/functions.php | 45 ++++++++++++++ client/post.php | 129 +++++++++++++++++++++++++++++++++++++- 4 files changed, 431 insertions(+), 14 deletions(-) diff --git a/client/document.php b/client/document.php index 6628eaf6..6fe2eb75 100644 --- a/client/document.php +++ b/client/document.php @@ -29,7 +29,7 @@ if (!isset($_GET['id']) && !intval($_GET['id'])) { $document_id = intval($_GET['id']); $sql_document = mysqli_query($mysqli, - "SELECT document_id, document_name, document_content + "SELECT document_id, document_name, document_content, document_description FROM documents WHERE document_id = $document_id AND document_client_visible = 1 AND document_client_id = $session_client_id AND document_template = 0 AND document_archived_at IS NULL LIMIT 1" @@ -41,11 +41,21 @@ if ($row) { $document_id = intval($row['document_id']); $document_name = nullable_htmlentities($row['document_name']); $document_content = $purifier->purify($row['document_content']); + $document_description = nullable_htmlentities($row['document_description']); } else { header("Location: post.php?logout"); exit(); } +// Check for associated files +$sql_files = mysqli_query($mysqli, + "SELECT f.file_id, f.file_name, f.file_reference_name, f.file_ext, f.file_size, f.file_mime_type + FROM files f + INNER JOIN document_files df ON f.file_id = df.file_id + WHERE df.document_id = $document_id AND f.file_client_id = $session_client_id + ORDER BY f.file_name ASC" +); + ?>
    @@ -60,12 +70,134 @@ if ($row) {
-
-
-

- + 0) { + $file_row = mysqli_fetch_array($sql_files); + $file_id = intval($file_row['file_id']); + $file_name = nullable_htmlentities($file_row['file_name']); + $file_reference_name = nullable_htmlentities($file_row['file_reference_name']); + $file_ext = strtolower($file_row['file_ext']); + $file_size = intval($file_row['file_size']); + $file_mime_type = nullable_htmlentities($file_row['file_mime_type']); + $file_size_formatted = formatBytes($file_size); + + $file_path = "../uploads/clients/$session_client_id/$file_reference_name"; + + // For PDF files, display them inline + if ($file_ext == 'pdf') { + ?> +
+
+
+
+

+ + + +
+
+ + Open in New Tab + + + Download + +
+
+
+
+ +
+
+ +
+
+
+
+

+ + + +
+
+ + View Full Size + + + Download + +
+
+
+
+ <?php echo $file_name; ?> +
+
+ +
+
+
+
+

+ + + +
+
+ + Open File + + + Download + +
+
+
+
+
+
+ +
+
+
+

+ Type: File
+ Size: +

+ Uploaded file: $file_name

$document_description

") { ?> +
+ +
+ +
+
+
+
+ +
+
+

+ +
-
+ -

Documents

+
+

Documents

+
+
+
+ + +
+
+
-
- - +
+
+
+ @@ -40,7 +54,9 @@ $documents_sql = mysqli_query($mysqli, "SELECT document_id, document_name, docum ?> - - + +
Name CreatedActions
+ + + + + + +
-
+
+ + + + + 1024 && $i < count($units) - 1; $i++) { + $bytes /= 1024; + } + + return round($bytes, $precision) . ' ' . $units[$i]; +} diff --git a/client/post.php b/client/post.php index 03ec1773..6edaa09d 100644 --- a/client/post.php +++ b/client/post.php @@ -629,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 ($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"; + $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 = [ [ @@ -750,3 +750,130 @@ if (isset($_POST['delete_recurring_payment'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } + +if (isset($_POST['client_add_document'])) { + + // Permission check - only primary or technical contacts can create documents + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + + $document_name = sanitizeInput($_POST['document_name']); + $document_description = sanitizeInput($_POST['document_description']); + $document_content = mysqli_real_escape_string($mysqli, $_POST['document_content']); + $document_content_raw = sanitizeInput($document_name . " " . strip_tags($_POST['document_content'])); + + // Create document + mysqli_query($mysqli, "INSERT INTO documents SET + document_name = '$document_name', + document_description = '$document_description', + document_content = '$document_content', + document_content_raw = '$document_content_raw', + document_client_visible = 1, + document_client_id = $session_client_id, + document_created_by = $session_contact_id"); + + $document_id = mysqli_insert_id($mysqli); + + // Logging + logAction("Document", "Create", "Client contact $session_contact_name created document $document_name", $session_client_id, $document_id); + + $_SESSION['alert_message'] = "Document $document_name created successfully"; + + header('Location: documents.php'); +} + +if (isset($_POST['client_upload_document'])) { + + // Permission check - only primary or technical contacts can upload documents + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + + $document_name = sanitizeInput($_POST['document_name']); + $document_description = sanitizeInput($_POST['document_description']); + $client_dir = "../uploads/clients/$session_client_id"; + + // Create client directory if it doesn't exist + if (!is_dir($client_dir)) { + mkdir($client_dir, 0755, true); + } + + // Allowed file extensions for documents + $allowedExtensions = ['pdf', 'doc', 'docx', 'txt', 'md', 'odt', 'rtf']; + + // Check if file was uploaded + if (isset($_FILES['document_file']) && $_FILES['document_file']['error'] == 0) { + + // Validate and get a safe file reference name + if ($file_reference_name = checkFileUpload($_FILES['document_file'], $allowedExtensions)) { + + $file_tmp_path = $_FILES['document_file']['tmp_name']; + $file_name = sanitizeInput($_FILES['document_file']['name']); + $extParts = explode('.', $file_name); + $file_extension = strtolower(end($extParts)); + $file_mime_type = sanitizeInput($_FILES['document_file']['type']); + $file_size = intval($_FILES['document_file']['size']); + + // Define destination path and move the uploaded file + $dest_path = $client_dir . "/" . $file_reference_name; + + if (move_uploaded_file($file_tmp_path, $dest_path)) { + + // Create document entry + $document_content = "

Uploaded file: $file_name

$document_description

"; + $document_content_raw = "$document_name $file_name $document_description"; + + mysqli_query($mysqli, "INSERT INTO documents SET + document_name = '$document_name', + document_description = '$document_description', + document_content = '$document_content', + document_content_raw = '$document_content_raw', + document_client_visible = 1, + document_client_id = $session_client_id, + document_created_by = $session_contact_id"); + + $document_id = mysqli_insert_id($mysqli); + + // Create file entry + mysqli_query($mysqli, "INSERT INTO files SET + file_reference_name = '$file_reference_name', + file_name = '$file_name', + file_description = 'Attached to document: $document_name', + file_ext = '$file_extension', + file_mime_type = '$file_mime_type', + file_size = $file_size, + file_created_by = $session_contact_id, + file_client_id = $session_client_id"); + + $file_id = mysqli_insert_id($mysqli); + + // Link file to document + mysqli_query($mysqli, "INSERT INTO document_files SET document_id = $document_id, file_id = $file_id"); + + // Logging + logAction("Document", "Upload", "Client contact $session_contact_name uploaded document $document_name with file $file_name", $session_client_id, $document_id); + + $_SESSION['alert_message'] = "Document $document_name uploaded successfully"; + + } else { + $_SESSION['alert_type'] = 'error'; + $_SESSION['alert_message'] = 'Error uploading file. Please try again.'; + } + + } else { + $_SESSION['alert_type'] = 'error'; + $_SESSION['alert_message'] = 'Invalid file type. Please upload PDF, Word documents, or text files only.'; + } + + } else { + $_SESSION['alert_type'] = 'error'; + $_SESSION['alert_message'] = 'Please select a file to upload.'; + } + + header('Location: documents.php'); +} + +?> From effbf241e64fb7a0144b28d0a5645c196de55c86 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Tue, 1 Jul 2025 10:51:56 +0100 Subject: [PATCH 032/244] Fix default rate and net terms if not provided in api call --- api/v1/clients/client_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1/clients/client_model.php b/api/v1/clients/client_model.php index a5b9759d..b9e9a6e9 100644 --- a/api/v1/clients/client_model.php +++ b/api/v1/clients/client_model.php @@ -39,7 +39,7 @@ if (isset($_POST['client_rate'])) { } elseif ($client_row) { $rate = $client_row['client_rate']; } else { - $rate = ''; + $rate = 0; } if (isset($_POST['client_currency_code'])) { @@ -55,7 +55,7 @@ if (isset($_POST['client_net_terms'])) { } elseif ($client_row) { $net_terms = $client_row['client_net_terms']; } else { - $net_terms = ''; + $net_terms = 0; } if (isset($_POST['client_tax_id_number'])) { From 873dc1f76d455ae1b1ef865d7dfce8ea0559a081 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Tue, 1 Jul 2025 11:50:20 +0100 Subject: [PATCH 033/244] Fix contact location if not provided in api call --- api/v1/contacts/contact_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1/contacts/contact_model.php b/api/v1/contacts/contact_model.php index cd909b34..dbac6bda 100644 --- a/api/v1/contacts/contact_model.php +++ b/api/v1/contacts/contact_model.php @@ -103,5 +103,5 @@ if (isset($_POST['contact_location_id'])) { } elseif ($contact_row) { $location_id = $contact_row['contact_location_id']; } else { - $location_id = ''; + $location_id = '0'; } From 8753655c9ceeba9399d6b03cb63e1e59410f29ae Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 14:18:14 -0400 Subject: [PATCH 034/244] Do not allow client portal logins with Contact users of a client that is archived --- client/login.php | 2 +- client/login_microsoft.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/login.php b/client/login.php index e69c6234..09f15a16 100644 --- a/client/login.php +++ b/client/login.php @@ -57,7 +57,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) { } else { - $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id WHERE user_email = '$email' AND user_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); + $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id LEFT JOIN clients ON contact_client_id = client_id WHERE user_email = '$email' AND client_archived_at IS NULL AND user_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); $row = mysqli_fetch_array($sql); $client_id = intval($row['contact_client_id']); $user_id = intval($row['user_id']); diff --git a/client/login_microsoft.php b/client/login_microsoft.php index 4c8eae65..c182a16d 100644 --- a/client/login_microsoft.php +++ b/client/login_microsoft.php @@ -100,7 +100,7 @@ if (isset($_POST['code']) && $_POST['state'] == session_id()) { $upn = mysqli_real_escape_string($mysqli, $msgraph_response["userPrincipalName"]); - $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id WHERE user_email = '$upn' AND user_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); + $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id LEFT JOIN contact_client_id = client_id WHERE user_email = '$upn' AND user_archived_at IS NULL AND client_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); $row = mysqli_fetch_array($sql); $client_id = intval($row['contact_client_id']); $user_id = intval($row['user_id']); From 67dc012caa31e68c30bd012c61d6ca8ed3c2a21a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 14:44:30 -0400 Subject: [PATCH 035/244] Small wording hints on file uploads instead of upload File its just upload and added the title of the upload modal from upload files to upload file(s) --- client_files.php | 2 +- modals/client_file_upload_modal.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client_files.php b/client_files.php index 1232b544..04a58e85 100644 --- a/client_files.php +++ b/client_files.php @@ -100,7 +100,7 @@ while ($folder_id > 0) {
diff --git a/modals/client_file_upload_modal.php b/modals/client_file_upload_modal.php index 65aaaa44..816f80df 100644 --- a/modals/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -2,7 +2,7 @@
-
Upload Files
+
Upload File(s)
@@ -23,7 +23,7 @@
- +
From e0364183e257489d5aec19fbd3fb2379d99122fe Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 16:03:57 -0400 Subject: [PATCH 036/244] Disable Certain Bulk Actions that are directly related to a client in client overview section instead are shown in the client section --- assets.php | 22 ++++++++++------ contacts.php | 14 ++++++++--- credentials.php | 8 ++++-- modals/software_add_from_template_modal.php | 28 ++++++++++++++++++++- post/user/asset.php | 2 +- 5 files changed, 59 insertions(+), 15 deletions(-) diff --git a/assets.php b/assets.php index eb01428b..18fb9db0 100644 --- a/assets.php +++ b/assets.php @@ -305,17 +305,15 @@ if (mysqli_num_rows($os_sql) > 0) { Bulk Action ()
+ Assign Contact
- - Transfer to Client - -
Assign Location + Set Physical Location @@ -327,6 +325,10 @@ if (mysqli_num_rows($os_sql) > 0) { Create Tickets +
+ + Transfer to Client +
- + - @@ -719,6 +725,8 @@ if (mysqli_num_rows($os_sql) > 0) {
+ Invite
Import
+ Export @@ -151,7 +153,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
+ + + + +
+ +
+
+ +
+ +
+
+ + +
diff --git a/post/user/asset.php b/post/user/asset.php index cde8202d..beb4f5f6 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -275,7 +275,7 @@ if (isset($_POST['bulk_assign_asset_physical_location'])) { // Bulk Logging logAction("Asset", "Bulk Edit", "$session_name set $asset_count assets to physical location $physical_location", $client_id); - $_SESSION['alert_message'] = "You moved $asset_count assets to location $location_name"; + $_SESSION['alert_message'] = "You moved $asset_count assets to location $physical_location"; } header("Location: " . $_SERVER["HTTP_REFERER"]); From e281a39512d15e70a1d6589e457e113625cedc13 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 16:08:15 -0400 Subject: [PATCH 037/244] Add title Icon for Bulk Set Status --- modals/asset_bulk_edit_status_modal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modals/asset_bulk_edit_status_modal.php b/modals/asset_bulk_edit_status_modal.php index bc3ddbe1..02e18e50 100644 --- a/modals/asset_bulk_edit_status_modal.php +++ b/modals/asset_bulk_edit_status_modal.php @@ -2,7 +2,7 @@
-
Bulk Edit Status
+
Bulk Edit Status
From dba04a407ac8f03fb4faac6810ca98de564cbe3a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 16:19:55 -0400 Subject: [PATCH 038/244] Fix Table Header Link Buttons in Asset Details --- asset_details.php | 49 ++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/asset_details.php b/asset_details.php index 261be970..569ba5be 100644 --- a/asset_details.php +++ b/asset_details.php @@ -719,8 +719,13 @@ if (isset($_GET['asset_id'])) {
"> -
-

Licenses

+
+

Licenses

+
+ +
@@ -806,7 +811,7 @@ if (isset($_GET['asset_id'])) {

Documents

-
@@ -872,23 +877,27 @@ if (isset($_GET['asset_id'])) {
"> -
-

Files

-
- +

Files

+
+
+ - - - - - - - + ?> + + + + + + +
+
@@ -1133,7 +1142,7 @@ if (isset($_GET['asset_id'])) {

Linked Services

-
From b87b801b04921048cccb4a7a58fdc0d148e20c7d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 16:24:51 -0400 Subject: [PATCH 039/244] Fix broken Table header Link buttons in contact details --- contact_details.php | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/contact_details.php b/contact_details.php index cf165bab..e42a9065 100644 --- a/contact_details.php +++ b/contact_details.php @@ -339,8 +339,13 @@ if (isset($_GET['contact_id'])) {
"> -
-

Related Assets

+
+

Related Assets

+
+ +
@@ -480,8 +485,13 @@ if (isset($_GET['contact_id'])) {
"> -
-

Credentials

+
+

Credentials

+
+ +
@@ -620,7 +630,7 @@ if (isset($_GET['contact_id'])) {

Related Licenses

-
@@ -869,7 +879,7 @@ if (isset($_GET['contact_id'])) {

Linked Services

-
@@ -927,7 +937,7 @@ if (isset($_GET['contact_id'])) {

Linked Documents

-
@@ -996,7 +1006,7 @@ if (isset($_GET['contact_id'])) {

Linked Files

-
From 6bc78622323bbd0188267983d835fe042bd2e39f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 3 Jul 2025 18:14:20 -0400 Subject: [PATCH 040/244] UI Dashb oard resize some Dashboard cards --- dashboard.php | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dashboard.php b/dashboard.php index d14ebe03..d3575f17 100644 --- a/dashboard.php +++ b/dashboard.php @@ -155,9 +155,12 @@ if ($user_config_dashboard_financial_enable == 1) { $recurring_invoices_added = intval($row['recurring_invoices_added']); } - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(client_id) AS clients_added FROM clients WHERE YEAR(client_created_at) = $year AND client_archived_at IS NULL")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(client_id) AS clients_added FROM clients WHERE YEAR(client_created_at) = $year AND client_lead = 0 AND client_archived_at IS NULL")); $clients_added = intval($row['clients_added']); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(client_id) AS leads_added FROM clients WHERE YEAR(client_created_at) = $year AND client_lead = 1 AND client_archived_at IS NULL")); + $leads_added = intval($row['leads_added']); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(vendor_id) AS vendors_added FROM vendors WHERE YEAR(vendor_created_at) = $year AND vendor_client_id = 0 AND vendor_archived_at IS NULL")); $vendors_added = intval($row['vendors_added']); ?> @@ -208,7 +211,7 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
@@ -222,7 +225,7 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
@@ -237,7 +240,7 @@ if ($user_config_dashboard_financial_enable == 1) { -
+
@@ -250,7 +253,7 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
@@ -264,7 +267,21 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
+ + +
+

+

New Leads

+
+
+ +
+ +
+ + +
@@ -278,7 +295,7 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
@@ -292,7 +309,7 @@ if ($user_config_dashboard_financial_enable == 1) {
-
+
From 9b6be66623d8aac0ce862864604f3f5879eb13f5 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 4 Jul 2025 15:42:26 -0400 Subject: [PATCH 041/244] Initial work on Adding Payment Methods for Online Payments in Client on Agent Side and initial work on AI Providers with multiple model support assigned to various sections and custom prompts --- client_autopay.php | 130 ++++++++++++++++++++++++++++++++++ database_updates.php | 31 +++++++- db.sql | 41 ++++++++++- includes/database_version.php | 2 +- 4 files changed, 198 insertions(+), 6 deletions(-) create mode 100644 client_autopay.php diff --git a/client_autopay.php b/client_autopay.php new file mode 100644 index 00000000..a4231baa --- /dev/null +++ b/client_autopay.php @@ -0,0 +1,130 @@ + + +
+
+

AutoPay

+
+ +
+ + + + Save card details
+ In order to set up automatic payments, you must create a customer record in Stripe.
+ First, you must authorize Stripe to store your card details for the purpose of automatic payment. +

+ +
+
+ +
+
+ + +
+
+ +
+ +
+
+
+ + + elseif (empty($stripe_pm)) { ?> + + Save card details
+ Please add the payment details you would like to save.
+ By adding payment details here, you grant consent for future automatic payments of invoices.

+ + + + +
+ +
+ + + + Manage saved payment methods + + customers->retrievePaymentMethod( + $stripe_id, + $stripe_pm, + [] + ); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when fetching payment method info for $stripe_pm: $error"); + logApp("Stripe", "error", "Exception when fetching payment method info for $stripe_pm: $error"); + } + + $card_name = nullable_htmlentities($payment_method->billing_details->name); + $card_brand = nullable_htmlentities($payment_method->card->display_brand); + $card_last4 = nullable_htmlentities($payment_method->card->last4); + $card_expires = nullable_htmlentities($payment_method->card->exp_month) . "/" . nullable_htmlentities($payment_method->card->exp_year); + + ?> + +
+ +
+ Actions
+ - Remove saved payment method + + + + +
+ +
+
+ + CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'"); } - // if (CURRENT_DATABASE_VERSION == '2.2.1') { - // // Insert queries here required to update to DB version 2.2.2 + if (CURRENT_DATABASE_VERSION == '2.2.1') { + mysqli_query($mysqli, "CREATE TABLE `ai_providers` ( + `ai_provider_id` INT(11) NOT NULL AUTO_INCREMENT, + `ai_provider_name` VARCHAR(200) NOT NULL, + `ai_provider_api_url` VARCHAR(200) NOT NULL, + `ai_provider_api_key` VARCHAR(200) DEFAULT NULL, + `ai_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ai_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`ai_provider_id`) + )"); + + mysqli_query($mysqli, "CREATE TABLE `ai_provider_models` ( + `ai_model_provider_id` INT(11) NOT NULL AUTO_INCREMENT, + `ai_model_provider_name` VARCHAR(200) NOT NULL, + `ai_model_prompt` TEXT DEFAULT NULL, + `ai_model_use_case` VARCHAR(200) DEFAULT NULL, + `ai_model_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ai_model_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `ai_model_ai_provider_id` INT(11) NOT NULL, + PRIMARY KEY (`ai_model_provider_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.2'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.2.2') { + // // Insert queries here required to update to DB version 2.2.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); // } } else { diff --git a/db.sql b/db.sql index d02d3ea2..d73df616 100644 --- a/db.sql +++ b/db.sql @@ -1,4 +1,4 @@ -/*M!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ -- MariaDB dump 10.19 Distrib 10.11.11-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: itflow_dev @@ -38,6 +38,43 @@ CREATE TABLE `accounts` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ai_provider_models` +-- + +DROP TABLE IF EXISTS `ai_provider_models`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `ai_provider_models` ( + `ai_model_provider_id` int(11) NOT NULL AUTO_INCREMENT, + `ai_model_provider_name` varchar(200) NOT NULL, + `ai_model_prompt` text DEFAULT NULL, + `ai_model_use_case` varchar(200) DEFAULT NULL, + `ai_model_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `ai_model_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `ai_model_ai_provider_id` int(11) NOT NULL, + PRIMARY KEY (`ai_model_provider_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ai_providers` +-- + +DROP TABLE IF EXISTS `ai_providers`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `ai_providers` ( + `ai_provider_id` int(11) NOT NULL AUTO_INCREMENT, + `ai_provider_name` varchar(200) NOT NULL, + `ai_provider_api_url` varchar(200) NOT NULL, + `ai_provider_api_key` varchar(200) DEFAULT NULL, + `ai_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `ai_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`ai_provider_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `api_keys` -- @@ -2591,4 +2628,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-06-21 18:33:02 +-- Dump completed on 2025-07-04 15:39:35 diff --git a/includes/database_version.php b/includes/database_version.php index 5ade9c63..023e9a12 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.1"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.2"); From e7503e8f55c9192b9f4a0c5d23b3a3678be90d96 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 4 Jul 2025 16:52:30 -0400 Subject: [PATCH 042/244] Initial DB work to Generalize Payment Providers, allow multiple payment providers and client payment methods, also to move payment methods to its own table instead of in categories, started work on ai provider ui models --- admin_settings_ai.php | 2 +- database_updates.php | 50 +++++++++++++++++-- db.sql | 66 +++++++++++++++++++++++- includes/database_version.php | 2 +- modals/admin_ai_add_ai_model_modal.php | 58 ++++++++++++++++++++++ modals/admin_ai_add_provider_modal.php | 69 ++++++++++++++++++++++++++ 6 files changed, 241 insertions(+), 6 deletions(-) create mode 100644 modals/admin_ai_add_ai_model_modal.php create mode 100644 modals/admin_ai_add_provider_modal.php diff --git a/admin_settings_ai.php b/admin_settings_ai.php index 894859b8..1f8d28f3 100644 --- a/admin_settings_ai.php +++ b/admin_settings_ai.php @@ -12,7 +12,7 @@ require_once "includes/inc_all_admin.php";
- +
diff --git a/database_updates.php b/database_updates.php index f09e7a63..55970285 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3705,10 +3705,54 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.2'"); } - // if (CURRENT_DATABASE_VERSION == '2.2.2') { - // // Insert queries here required to update to DB version 2.2.3 + if (CURRENT_DATABASE_VERSION == '2.2.2') { + mysqli_query($mysqli, "CREATE TABLE `payment_methods` ( + `payment_method_id` INT(11) NOT NULL AUTO_INCREMENT, + `payment_method_name` VARCHAR(200) NOT NULL, + `payment_method_description` VARCHAR(250) DEFAULT NULL, + `payment_method_provider_id` INT(1) DEFAULT 0, + `payment_method_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `payment_method_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`payment_method_id`) + )"); + + mysqli_query($mysqli, "CREATE TABLE `payment_providers` ( + `payment_provider_id` INT(11) NOT NULL AUTO_INCREMENT, + `payment_provider_name` VARCHAR(200) NOT NULL, + `payment_provider_description` VARCHAR(250) DEFAULT NULL, + `payment_provider_public_key` VARCHAR(250) DEFAULT NULL, + `payment_provider_private_key` VARCHAR(250) DEFAULT NULL, + `payment_provider_threshold` DECIMAL(15,2) DEFAULT NULL, + `payment_provider_active` TINYINT(1) NOT NULL DEFAULT 1, + `payment_provider_account` INT(11) NOT NULL, + `payment_provider_expense_vendor` INT(11) NOT NULL DEFAULT 0, + `payment_provider_expense_category` INT(11) NOT NULL DEFAULT 0, + `payment_provider_expense_percentage_fee` DECIMAL(4,4) DEFAULT NULL, + `payment_provider_expense_flat_fee` DECIMAL(15,2) DEFAULT NULL, + `payment_provider_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `payment_provider_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`payment_provider_id`) + )"); + + mysqli_query($mysqli, "CREATE TABLE `cient_saved_payment_methods` ( + `saved_payment_id` INT(11) NOT NULL AUTO_INCREMENT, + `saved_payment_provider_client` VARCHAR(200) NOT NULL, + `saved_payment_provider_method` VARCHAR(200) NOT NULL, + `saved_payment_details` VARCHAR(200) DEFAULT NULL, + `saved_payment_client_id` INT(11) NOT NULL, + `saved_payment_provider_id` INT(11) NOT NULL, + `saved_payment_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `saved_payment_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`saved_payment_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.2.3') { + // // Insert queries here required to update to DB version 2.2.4 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); // } } else { diff --git a/db.sql b/db.sql index d73df616..a226a229 100644 --- a/db.sql +++ b/db.sql @@ -486,6 +486,26 @@ CREATE TABLE `certificates` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `cient_saved_payment_methods` +-- + +DROP TABLE IF EXISTS `cient_saved_payment_methods`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `cient_saved_payment_methods` ( + `saved_payment_id` int(11) NOT NULL AUTO_INCREMENT, + `saved_payment_provider_client` varchar(200) NOT NULL, + `saved_payment_provider_method` varchar(200) NOT NULL, + `saved_payment_details` varchar(200) DEFAULT NULL, + `saved_payment_client_id` int(11) NOT NULL, + `saved_payment_provider_id` int(11) NOT NULL, + `saved_payment_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `saved_payment_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`saved_payment_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `client_notes` -- @@ -1300,6 +1320,50 @@ CREATE TABLE `notifications` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `payment_methods` +-- + +DROP TABLE IF EXISTS `payment_methods`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `payment_methods` ( + `payment_method_id` int(11) NOT NULL AUTO_INCREMENT, + `payment_method_name` varchar(200) NOT NULL, + `payment_method_description` varchar(250) DEFAULT NULL, + `payment_method_provider_id` int(1) DEFAULT 0, + `payment_method_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `payment_method_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`payment_method_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `payment_providers` +-- + +DROP TABLE IF EXISTS `payment_providers`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `payment_providers` ( + `payment_provider_id` int(11) NOT NULL AUTO_INCREMENT, + `payment_provider_name` varchar(200) NOT NULL, + `payment_provider_description` varchar(250) DEFAULT NULL, + `payment_provider_public_key` varchar(250) DEFAULT NULL, + `payment_provider_private_key` varchar(250) DEFAULT NULL, + `payment_provider_threshold` decimal(15,2) DEFAULT NULL, + `payment_provider_active` tinyint(1) NOT NULL DEFAULT 1, + `payment_provider_account` int(11) NOT NULL, + `payment_provider_expense_vendor` int(11) NOT NULL DEFAULT 0, + `payment_provider_expense_category` int(11) NOT NULL DEFAULT 0, + `payment_provider_expense_percentage_fee` decimal(4,4) DEFAULT NULL, + `payment_provider_expense_flat_fee` decimal(15,2) DEFAULT NULL, + `payment_provider_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `payment_provider_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`payment_provider_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `payments` -- @@ -2628,4 +2692,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-04 15:39:35 +-- Dump completed on 2025-07-04 16:50:41 diff --git a/includes/database_version.php b/includes/database_version.php index 023e9a12..e9eef2e5 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.2"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.3"); diff --git a/modals/admin_ai_add_ai_model_modal.php b/modals/admin_ai_add_ai_model_modal.php new file mode 100644 index 00000000..ea8b8e9a --- /dev/null +++ b/modals/admin_ai_add_ai_model_modal.php @@ -0,0 +1,58 @@ +
+ \ No newline at end of file diff --git a/modals/admin_ai_add_provider_modal.php b/modals/admin_ai_add_provider_modal.php new file mode 100644 index 00000000..5ad9d46c --- /dev/null +++ b/modals/admin_ai_add_provider_modal.php @@ -0,0 +1,69 @@ +
+ From 8d1bf3d2455a2244c9ae5837b752ac9dbbd0bd67 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 4 Jul 2025 17:48:54 -0400 Subject: [PATCH 043/244] UI add modal and listing work on Payment Providers --- admin_payment_provider.php | 134 ++++++++++++++++ includes/admin_side_nav.php | 6 + ...modal.php => admin_ai_model_add_modal.php} | 0 ...al.php => admin_ai_provider_add_modal.php} | 0 modals/admin_payment_provider_add_modal.php | 150 ++++++++++++++++++ 5 files changed, 290 insertions(+) create mode 100644 admin_payment_provider.php rename modals/{admin_ai_add_ai_model_modal.php => admin_ai_model_add_modal.php} (100%) rename modals/{admin_ai_add_provider_modal.php => admin_ai_provider_add_modal.php} (100%) create mode 100644 modals/admin_payment_provider_add_modal.php diff --git a/admin_payment_provider.php b/admin_payment_provider.php new file mode 100644 index 00000000..6e2fa591 --- /dev/null +++ b/admin_payment_provider.php @@ -0,0 +1,134 @@ + + +
+
+

Payment Providers

+
+ +
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
+ + Provider + + + + Account + + + + Threshold + + + + Expense Vendor + + + + Expense Category + + + Fee + Action
+ + + + + + +
+ +
+ + Edit + +
+ + Disable + +
+
+
+ +
+
+
+ +Taxes

+
  • + + +

    Payment Providers

    +     +
  • diff --git a/modals/admin_ai_add_ai_model_modal.php b/modals/admin_ai_model_add_modal.php similarity index 100% rename from modals/admin_ai_add_ai_model_modal.php rename to modals/admin_ai_model_add_modal.php diff --git a/modals/admin_ai_add_provider_modal.php b/modals/admin_ai_provider_add_modal.php similarity index 100% rename from modals/admin_ai_add_provider_modal.php rename to modals/admin_ai_provider_add_modal.php diff --git a/modals/admin_payment_provider_add_modal.php b/modals/admin_payment_provider_add_modal.php new file mode 100644 index 00000000..a9951b22 --- /dev/null +++ b/modals/admin_payment_provider_add_modal.php @@ -0,0 +1,150 @@ +
    + From 77597fd7a9b28bb2c9b39220dc7024eca0e13528 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 4 Jul 2025 18:07:59 -0400 Subject: [PATCH 044/244] Update wording on Add Payment Processing, we plan on using the income/expense account to be named after provider name and category be processing fees and the vendor named after the provider name if payment processing expense is enabled --- modals/admin_payment_provider_add_modal.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modals/admin_payment_provider_add_modal.php b/modals/admin_payment_provider_add_modal.php index a9951b22..3f91e4dc 100644 --- a/modals/admin_payment_provider_add_modal.php +++ b/modals/admin_payment_provider_add_modal.php @@ -13,6 +13,10 @@
    +
    An income account named after the provider will always be created and used for income of payed invoices. + If the "Payment Provider Expenses" option is enabled, a matching vendor will also be automatically created (if it doesn't already exist), and used for expense tracking. Additionally, an expense category named "Payment Processing" will be created if it does not already exist. +
    +
    From ed0936059bf6411014368f2faebda04dddd223f8 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 6 Jul 2025 11:50:12 -0400 Subject: [PATCH 045/244] Convert new lines to brs for contact notes --- contact_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contact_details.php b/contact_details.php index e42a9065..0f7f06be 100644 --- a/contact_details.php +++ b/contact_details.php @@ -1095,7 +1095,7 @@ if (isset($_GET['contact_id'])) { while ($row = mysqli_fetch_array($sql_related_notes)) { $contact_note_id = intval($row['contact_note_id']); $contact_note_type = nullable_htmlentities($row['contact_note_type']); - $contact_note = nullable_htmlentities($row['contact_note']); + $contact_note = nl2br(nullable_htmlentities($row['contact_note'])); $note_by = nullable_htmlentities($row['user_name']); $contact_note_created_at = nullable_htmlentities($row['contact_note_created_at']); From fa9acef2793bceb1d24184c00b41b2a468315c21 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 6 Jul 2025 12:47:26 -0400 Subject: [PATCH 046/244] Fixed IMAP test button with error details --- admin_settings_mail.php | 2 +- post/admin/admin_settings_mail.php | 45 ++++++++++-------------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/admin_settings_mail.php b/admin_settings_mail.php index 48814e69..b2649093 100644 --- a/admin_settings_mail.php +++ b/admin_settings_mail.php @@ -319,7 +319,7 @@ require_once "includes/inc_all_admin.php";
    - +
    diff --git a/post/admin/admin_settings_mail.php b/post/admin/admin_settings_mail.php index 9178e832..005c72dd 100644 --- a/post/admin/admin_settings_mail.php +++ b/post/admin/admin_settings_mail.php @@ -117,42 +117,27 @@ if (isset($_POST['test_email_smtp'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } - -// Test IMAP -// Autoload Composer dependencies -// require_once __DIR__ . '/../plugins/php-imap/vendor/autoload.php'; - -// Webklex PHP-IMAP -//use Webklex\PHPIMAP\ClientManager; - if (isset($_POST['test_email_imap'])) { - /* - validateCSRFToken($_POST['csrf_token']); + validateCSRFToken($_POST['csrf_token']); - try { - // Initialize the client manager and create the client - $clientManager = new ClientManager(); - $client = $clientManager->make([ - 'host' => $config_imap_host, - 'port' => $config_imap_port, - 'encryption' => $config_imap_encryption, - 'validate_cert' => true, - 'username' => $config_imap_username, - 'password' => $config_imap_password, - 'protocol' => 'imap' - ]); + // Setup your IMAP connection parameters + $hostname = "{" . $config_imap_host . ":" . $config_imap_port . "/" . $config_imap_encryption . "/novalidate-cert}INBOX"; + $username = $config_imap_username; + $password = $config_imap_password; - // Connect to the IMAP server - $client->connect(); + try { + $inbox = @imap_open($hostname, $username, $password); + if ($inbox) { + imap_close($inbox); $_SESSION['alert_message'] = "Connected successfully"; - } catch (Exception $e) { - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Test IMAP connection failed: " . $e->getMessage(); + } else { + throw new Exception(imap_last_error()); } - */ - $_SESSION['alert_message'] = "Test is Work In Progress"; + } catch (Exception $e) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Test IMAP connection failed: " . $e->getMessage(); + } header("Location: " . $_SERVER["HTTP_REFERER"]); - } From a011dc4dea8a0da621877a061fab2ca5cc63a561 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 6 Jul 2025 17:01:28 -0400 Subject: [PATCH 047/244] POST code for AI and Payment Providers --- admin_payment_provider.php | 8 +- database_updates.php | 12 +- modals/admin_payment_provider_add_modal.php | 71 +--------- post/admin/admin_ai.php | 137 ++++++++++++++++++++ post/admin/admin_payment_provider.php | 107 +++++++++++++++ 5 files changed, 258 insertions(+), 77 deletions(-) create mode 100644 post/admin/admin_ai.php create mode 100644 post/admin/admin_payment_provider.php diff --git a/admin_payment_provider.php b/admin_payment_provider.php index 6e2fa591..e06c76a7 100644 --- a/admin_payment_provider.php +++ b/admin_payment_provider.php @@ -40,8 +40,8 @@ $num_rows = mysqli_num_rows($sql); - - Threshold + + Threshold @@ -86,10 +86,10 @@ $num_rows = mysqli_num_rows($sql); - + - + + +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
    + + Method + + + + Description + + + + Provider + + Action
    + + + + +
    + +
    + + Edit + +
    + + Delete + +
    +
    +
    + +
    +
    +
    + + diff --git a/ajax/ajax_invoice_pay.php b/ajax/ajax_invoice_pay.php index cbf6eb1c..e4e4563b 100644 --- a/ajax/ajax_invoice_pay.php +++ b/ajax/ajax_invoice_pay.php @@ -132,13 +132,11 @@ ob_start(); - + +
    +
    Editing:
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Editing:
    + +
    +
    + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + Will not show as an option at Checkout if above this number +
    + +
    + +
    +
    + value="1" id="enableEditExpenseSwitch"> + +
    + (Category: Payment Processing -- Vendor: +
    + +
    + +
    +
    + +
    + +
    + See here for the latest Stripe Fees. +
    + +
    + +
    +
    + +
    + +
    + See here for the latest Stripe Fees. +
    + +
    +
    + + +
    +
    + +- Method of Transfer - - + CURRENT_DATABASE_VERSION) { `payment_method_id` INT(11) NOT NULL AUTO_INCREMENT, `payment_method_name` VARCHAR(200) NOT NULL, `payment_method_description` VARCHAR(250) DEFAULT NULL, - `payment_method_provider_id` INT(1) DEFAULT 0, + `payment_method_provider_id` INT(11) DEFAULT 0, `payment_method_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `payment_method_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`payment_method_id`) diff --git a/db.sql b/db.sql index a226a229..9985423c 100644 --- a/db.sql +++ b/db.sql @@ -39,21 +39,21 @@ CREATE TABLE `accounts` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `ai_provider_models` +-- Table structure for table `ai_models` -- -DROP TABLE IF EXISTS `ai_provider_models`; +DROP TABLE IF EXISTS `ai_models`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; -CREATE TABLE `ai_provider_models` ( - `ai_model_provider_id` int(11) NOT NULL AUTO_INCREMENT, - `ai_model_provider_name` varchar(200) NOT NULL, +CREATE TABLE `ai_models` ( + `ai_model_id` int(11) NOT NULL AUTO_INCREMENT, + `ai_model_name` varchar(200) NOT NULL, `ai_model_prompt` text DEFAULT NULL, `ai_model_use_case` varchar(200) DEFAULT NULL, `ai_model_created_at` datetime NOT NULL DEFAULT current_timestamp(), `ai_model_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `ai_model_ai_provider_id` int(11) NOT NULL, - PRIMARY KEY (`ai_model_provider_id`) + PRIMARY KEY (`ai_model_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -69,8 +69,8 @@ CREATE TABLE `ai_providers` ( `ai_provider_name` varchar(200) NOT NULL, `ai_provider_api_url` varchar(200) NOT NULL, `ai_provider_api_key` varchar(200) DEFAULT NULL, - `ai_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `ai_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `ai_provider_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `ai_provider_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), PRIMARY KEY (`ai_provider_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1331,7 +1331,7 @@ CREATE TABLE `payment_methods` ( `payment_method_id` int(11) NOT NULL AUTO_INCREMENT, `payment_method_name` varchar(200) NOT NULL, `payment_method_description` varchar(250) DEFAULT NULL, - `payment_method_provider_id` int(1) DEFAULT 0, + `payment_method_provider_id` int(11) DEFAULT 0, `payment_method_created_at` datetime NOT NULL DEFAULT current_timestamp(), `payment_method_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), PRIMARY KEY (`payment_method_id`) @@ -2692,4 +2692,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-04 16:50:41 +-- Dump completed on 2025-07-07 16:36:58 diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 83c028f3..44056eed 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -54,7 +54,13 @@

    Taxes

    • -
  • +
  • + + +

    Payment Methods

    +     +
    • +

  • Payment Providers

    diff --git a/invoice.php b/invoice.php index ddf07578..7c83c3af 100644 --- a/invoice.php +++ b/invoice.php @@ -234,7 +234,7 @@ if (isset($_GET['invoice_id'])) {     - Pay via saved card + Pay via Payment Provider diff --git a/modals/admin_payment_method_add_modal.php b/modals/admin_payment_method_add_modal.php new file mode 100644 index 00000000..9703b0f9 --- /dev/null +++ b/modals/admin_payment_method_add_modal.php @@ -0,0 +1,58 @@ + diff --git a/modals/admin_payment_provider_add_modal.php b/modals/admin_payment_provider_add_modal.php index d1680353..b72a8131 100644 --- a/modals/admin_payment_provider_add_modal.php +++ b/modals/admin_payment_provider_add_modal.php @@ -49,6 +49,17 @@
    • +
    + +
    +
    + +
    + +
    + Will not show as an option at Checkout if above this number +
    +
    @@ -75,7 +86,7 @@
    - +
    See here for the latest Stripe Fees.
    diff --git a/modals/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php index 6e4c030c..4bffe1db 100644 --- a/modals/invoice_payment_add_bulk_modal.php +++ b/modals/invoice_payment_add_bulk_modal.php @@ -102,13 +102,12 @@ - + - Method of Transfer - - + $name created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_payment_method'])) { + + validateCSRFToken($_POST['csrf_token']); + + $payment_method_id = intval($_POST['payment_method_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $provider = intval($_POST['provider']); + + mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description', payment_method_provider_id = $provider_id WHERE payment_method_id = $payment_method_id"); + + // Logging + logAction("Payment Method", "Edit", "$session_name edited Payment Method $name"); + + $_SESSION['alert_message'] = "Payment Method $name edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_payment_method'])) { + + $payment_method_id = intval($_GET['delete_payment_method']); + + $sql = mysqli_query($mysqli,"SELECT payment_method_name FROM payment_methods WHERE payment_method_id = $payment_method_id"); + $row = mysqli_fetch_array($sql); + $payment_method_name = sanitizeInput($row['payment_method_name']); + + mysqli_query($mysqli,"DELETE FROM payment_methods WHERE payment_method_id = $payment_method_id"); + + // Logging + logAction("Payment Method", "Delete", "$session_name deleted Payment Method $payment_method_name"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Payment Method $payment_method_name deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/admin/admin_payment_provider.php b/post/admin/admin_payment_provider.php index b96989b3..0f13af2f 100644 --- a/post/admin/admin_payment_provider.php +++ b/post/admin/admin_payment_provider.php @@ -66,7 +66,6 @@ if (isset($_POST['edit_payment_provider'])) { validateCSRFToken($_POST['csrf_token']); $provider_id = intval($_POST['provider_id']); - $provider = sanitizeInput($_POST['provider']); $description = sanitizeInput($_POST['description']); $public_key = sanitizeInput($_POST['public_key']); $private_key = sanitizeInput($_POST['private_key']); @@ -75,7 +74,7 @@ if (isset($_POST['edit_payment_provider'])) { $percentage_fee = floatval($_POST['percentage_fee']) / 100; $flat_fee = floatval($_POST['flat_fee']); - mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_name = '$name', payment_provider_url = '$url', payment_provider_api_key = '$api_key', payment_provider_percentage_fee = $percentage_fee, payment_provider_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id"); + mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id"); // Logging logAction("Payment Provider", "Edit", "$session_name edited Payment Provider $provider"); diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php index 7e174076..15bbdd71 100644 --- a/scripts/setup_cli.php +++ b/scripts/setup_cli.php @@ -285,9 +285,12 @@ mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Advertising', mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Service', category_type = 'Income', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Friend', category_type = 'Referral', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Search Engine', category_type = 'Referral', category_color = 'red'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Bank Transfer', category_type = 'Payment Method', category_color = 'green'"); + +// Payment Methods +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); // Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); diff --git a/setup.php b/setup.php index 71a09a94..ba0e1f50 100644 --- a/setup.php +++ b/setup.php @@ -438,10 +438,10 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Client', category_type = 'Referral', category_color = 'lightblue'"); // Payment Methods - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Bank Transfer', category_type = 'Payment Method', category_color = 'green'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Credit Card', category_type = 'Payment Method', category_color = 'purple'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); // Default Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); From 7e17fdf8513ff8e3f8dfa0304c10ba48c0a97334 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 7 Jul 2025 18:25:23 -0400 Subject: [PATCH 050/244] Add new UI for Saved Payments for payment providers --- admin_category.php | 7 -- admin_payment_provider.php | 7 ++ admin_saved_payment_method.php | 124 ++++++++++++++++++++++ database_updates.php | 36 ++++++- includes/admin_side_nav.php | 6 ++ post/admin/admin_saved_payment_method.php | 70 ++++++++++++ 6 files changed, 239 insertions(+), 11 deletions(-) create mode 100644 admin_saved_payment_method.php create mode 100644 post/admin/admin_saved_payment_method.php diff --git a/admin_category.php b/admin_category.php index 4370b5d4..177df25d 100644 --- a/admin_category.php +++ b/admin_category.php @@ -77,13 +77,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } else { echo 'btn-default'; } ?>">Referral - Payment - Method Fee + + Saved Payment Methods + Action @@ -73,6 +76,9 @@ $num_rows = mysqli_num_rows($sql); $percent_fee = floatval($row['payment_provider_expense_percentage_fee']) * 100; $flat_fee = floatval($row['payment_provider_expense_flat_fee']); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('saved_payment_id') AS saved_payment_count FROM client_saved_payment_methods WHERE saved_payment_provider_id = $provider_id")); + $saved_payment_count = intval($row['saved_payment_count']); + ?> @@ -90,6 +96,7 @@ $num_rows = mysqli_num_rows($sql); + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
    + + Client + + + + Provider + + + + Details + + + + Provider Client ID + + + + Provider Payment Method ID + + + + Created + + Action
    () () + + Delete + +
    + +
    +
    +
    + + CURRENT_DATABASE_VERSION) { PRIMARY KEY (`payment_provider_id`) )"); - mysqli_query($mysqli, "CREATE TABLE `cient_saved_payment_methods` ( + mysqli_query($mysqli, "CREATE TABLE `client_saved_payment_methods` ( `saved_payment_id` INT(11) NOT NULL AUTO_INCREMENT, `saved_payment_provider_client` VARCHAR(200) NOT NULL, `saved_payment_provider_method` VARCHAR(200) NOT NULL, @@ -3749,10 +3749,38 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } - // if (CURRENT_DATABASE_VERSION == '2.2.3') { - // // Insert queries here required to update to DB version 2.2.4 + if (CURRENT_DATABASE_VERSION == '2.2.3') { + + // Delete all Recurring Payments that are Stripe + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe'"); + + // Delete Stripe Specific ITFlow Client Stripe Client Relationship Table + mysqli_query($mysqli, "DROP TABLE client_stripe"); + + // Delete Unused Stripe and AI Settings now in their own tables + mysqli_query($mysqli, "ALTER TABLE `settings` + DROP `config_stripe_enable`, + DROP `config_stripe_publishable`, + DROP `config_stripe_secret`, + DROP `config_stripe_account`, + DROP `config_stripe_expense_vendor`, + DROP `config_stripe_expense_category`, + DROP `config_stripe_percentage_fee`, + DROP `config_stripe_flat_fee`, + DROP `config_ai_enable`, + DROP `config_ai_provider`, + DROP `config_ai_model`, + DROP `config_ai_url`, + DROP `config_ai_api_key` + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.2.4') { + // // Insert queries here required to update to DB version 2.2.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); // } } else { diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 44056eed..1ba4c7e5 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -66,6 +66,12 @@

    Payment Providers

    +
  • + + +

    Saved Payments

    +     +
  • diff --git a/post/admin/admin_saved_payment_method.php b/post/admin/admin_saved_payment_method.php new file mode 100644 index 00000000..e697b1f2 --- /dev/null +++ b/post/admin/admin_saved_payment_method.php @@ -0,0 +1,70 @@ +paymentMethods->detach($payment_method, []); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); + logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + } + + // Remove payment method from ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $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 = $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_name deleted saved Stripe payment method (PM: $payment_method)", $client_id); + $_SESSION['alert_message'] = "Payment method removed"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['stripe_reset_customer'])) { + validateCSRFToken($_GET['csrf_token']); + + $client_id = intval($_GET['client_id']); + + // Delete the customer id and payment method id stored in ITFlow, allowing the client to set these up again + mysqli_query($mysqli, "DELETE FROM client_stripe WHERE client_id = $client_id"); + + // 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 = $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 + logAction("Stripe", "Delete", "$session_name reset Stripe settings for client", $client_id); + + $_SESSION['alert_message'] = "Reset client Stripe settings"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file From a6f83493f8d4ee387a391966d19599b3f9889b0f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 7 Jul 2025 23:22:35 -0400 Subject: [PATCH 051/244] Fix Payment Method Additons in setup --- scripts/setup_cli.php | 8 ++++---- setup.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php index 15bbdd71..1f7f7a40 100644 --- a/scripts/setup_cli.php +++ b/scripts/setup_cli.php @@ -287,10 +287,10 @@ mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Friend', categ mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Search Engine', category_type = 'Referral', category_color = 'red'"); // Payment Methods -mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); -mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); -mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); -mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Cash'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Check'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'ACH'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Credit Card'"); // Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); diff --git a/setup.php b/setup.php index ba0e1f50..63f658d4 100644 --- a/setup.php +++ b/setup.php @@ -438,10 +438,10 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Client', category_type = 'Referral', category_color = 'lightblue'"); // Payment Methods - mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); - mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); - mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); - mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Cash'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Check'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'ACH'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Credit Card'"); // Default Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); From 93f4ea51fd2a445c5ae8c25ee613cef73c6326af Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 8 Jul 2025 14:07:10 -0400 Subject: [PATCH 052/244] Rework Payment Provider AI Provider Tables and logic add cascading deletes --- database_updates.php | 55 ++++++++----- db.sql | 74 +++++++++++------ post/admin/admin_saved_payment_method.php | 99 +++++++++++------------ 3 files changed, 136 insertions(+), 92 deletions(-) diff --git a/database_updates.php b/database_updates.php index dab71d07..c8bfe440 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3675,10 +3675,10 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.0'"); } - if (CURRENT_DATABASE_VERSION == '2.2.0') { - mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_quote_id` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_asset_id`"); - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'"); - } + if (CURRENT_DATABASE_VERSION == '2.2.0') { + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_quote_id` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_asset_id`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'"); + } if (CURRENT_DATABASE_VERSION == '2.2.1') { mysqli_query($mysqli, "CREATE TABLE `ai_providers` ( @@ -3691,16 +3691,21 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { PRIMARY KEY (`ai_provider_id`) )"); - mysqli_query($mysqli, "CREATE TABLE `ai_models` ( - `ai_model_id` INT(11) NOT NULL AUTO_INCREMENT, - `ai_model_name` VARCHAR(200) NOT NULL, - `ai_model_prompt` TEXT DEFAULT NULL, - `ai_model_use_case` VARCHAR(200) DEFAULT NULL, - `ai_model_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, - `ai_model_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, - `ai_model_ai_provider_id` INT(11) NOT NULL, - PRIMARY KEY (`ai_model_id`) - )"); + mysqli_query($mysqli, " + CREATE TABLE `ai_models` ( + `ai_model_id` INT(11) NOT NULL AUTO_INCREMENT, + `ai_model_name` VARCHAR(200) NOT NULL, + `ai_model_prompt` TEXT DEFAULT NULL, + `ai_model_use_case` VARCHAR(200) DEFAULT NULL, + `ai_model_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ai_model_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `ai_model_ai_provider_id` INT(11) NOT NULL, + PRIMARY KEY (`ai_model_id`), + FOREIGN KEY (`ai_model_ai_provider_id`) + REFERENCES `ai_providers`(`ai_provider_id`) + ON DELETE CASCADE + ) + "); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.2'"); } @@ -3710,7 +3715,6 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `payment_method_id` INT(11) NOT NULL AUTO_INCREMENT, `payment_method_name` VARCHAR(200) NOT NULL, `payment_method_description` VARCHAR(250) DEFAULT NULL, - `payment_method_provider_id` INT(11) DEFAULT 0, `payment_method_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `payment_method_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`payment_method_id`) @@ -3736,16 +3740,31 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "CREATE TABLE `client_saved_payment_methods` ( `saved_payment_id` INT(11) NOT NULL AUTO_INCREMENT, - `saved_payment_provider_client` VARCHAR(200) NOT NULL, `saved_payment_provider_method` VARCHAR(200) NOT NULL, - `saved_payment_details` VARCHAR(200) DEFAULT NULL, + `saved_payment_description` VARCHAR(200) DEFAULT NULL, `saved_payment_client_id` INT(11) NOT NULL, `saved_payment_provider_id` INT(11) NOT NULL, `saved_payment_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `saved_payment_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`saved_payment_id`) + PRIMARY KEY (`saved_payment_id`), + FOREIGN KEY (`saved_payment_client_id`) REFERENCES clients(`client_id`) ON DELETE CASCADE, + FOREIGN KEY (`saved_payment_provider_id`) REFERENCES payment_providers(`payment_provider_id`) ON DELETE CASCADE )"); + mysqli_query($mysqli, "CREATE TABLE `client_payment_provider` ( + `client_id` INT(11) NOT NULL, + `payment_provider_id` INT(11) NOT NULL, + `payment_provider_client` VARCHAR(200) NOT NULL, + `client_payment_provider_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`client_id`, `payment_provider_id`), + FOREIGN KEY (`client_id`) REFERENCES clients(`client_id`) ON DELETE CASCADE, + FOREIGN KEY (`payment_provider_id`) REFERENCES payment_providers(`payment_provider_id`) ON DELETE CASCADE + )"); + + mysqli_query($mysqli, "ALTER TABLE `recurring_payments` ADD `recurring_payment_saved_payment_id` INT(11) DEFAULT NULL AFTER `recurring_payment_recurring_invoice_id`"); + + mysqli_query($mysqli, "ALTER TABLE `recurring_payments` ADD CONSTRAINT `fk_recurring_saved_payment` FOREIGN KEY (`recurring_payment_saved_payment_id`) REFERENCES `client_saved_payment_methods`(`saved_payment_id`) ON DELETE CASCADE"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } diff --git a/db.sql b/db.sql index 9985423c..82716e33 100644 --- a/db.sql +++ b/db.sql @@ -53,7 +53,9 @@ CREATE TABLE `ai_models` ( `ai_model_created_at` datetime NOT NULL DEFAULT current_timestamp(), `ai_model_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `ai_model_ai_provider_id` int(11) NOT NULL, - PRIMARY KEY (`ai_model_id`) + PRIMARY KEY (`ai_model_id`), + KEY `ai_model_ai_provider_id` (`ai_model_ai_provider_id`), + CONSTRAINT `ai_models_ibfk_1` FOREIGN KEY (`ai_model_ai_provider_id`) REFERENCES `ai_providers` (`ai_provider_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -486,26 +488,6 @@ CREATE TABLE `certificates` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `cient_saved_payment_methods` --- - -DROP TABLE IF EXISTS `cient_saved_payment_methods`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8mb4 */; -CREATE TABLE `cient_saved_payment_methods` ( - `saved_payment_id` int(11) NOT NULL AUTO_INCREMENT, - `saved_payment_provider_client` varchar(200) NOT NULL, - `saved_payment_provider_method` varchar(200) NOT NULL, - `saved_payment_details` varchar(200) DEFAULT NULL, - `saved_payment_client_id` int(11) NOT NULL, - `saved_payment_provider_id` int(11) NOT NULL, - `saved_payment_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `saved_payment_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - PRIMARY KEY (`saved_payment_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `client_notes` -- @@ -528,6 +510,48 @@ CREATE TABLE `client_notes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `client_payment_provider` +-- + +DROP TABLE IF EXISTS `client_payment_provider`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `client_payment_provider` ( + `client_id` int(11) NOT NULL, + `payment_provider_id` int(11) NOT NULL, + `payment_provider_client` varchar(200) NOT NULL, + `client_payment_provider_created_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`client_id`,`payment_provider_id`), + KEY `payment_provider_id` (`payment_provider_id`), + CONSTRAINT `client_payment_provider_ibfk_1` FOREIGN KEY (`client_id`) REFERENCES `clients` (`client_id`) ON DELETE CASCADE, + CONSTRAINT `client_payment_provider_ibfk_2` FOREIGN KEY (`payment_provider_id`) REFERENCES `payment_providers` (`payment_provider_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `client_saved_payment_methods` +-- + +DROP TABLE IF EXISTS `client_saved_payment_methods`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `client_saved_payment_methods` ( + `saved_payment_id` int(11) NOT NULL AUTO_INCREMENT, + `saved_payment_provider_method` varchar(200) NOT NULL, + `saved_payment_description` varchar(200) DEFAULT NULL, + `saved_payment_client_id` int(11) NOT NULL, + `saved_payment_provider_id` int(11) NOT NULL, + `saved_payment_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `saved_payment_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`saved_payment_id`), + KEY `saved_payment_client_id` (`saved_payment_client_id`), + KEY `saved_payment_provider_id` (`saved_payment_provider_id`), + CONSTRAINT `client_saved_payment_methods_ibfk_1` FOREIGN KEY (`saved_payment_client_id`) REFERENCES `clients` (`client_id`) ON DELETE CASCADE, + CONSTRAINT `client_saved_payment_methods_ibfk_2` FOREIGN KEY (`saved_payment_provider_id`) REFERENCES `payment_providers` (`payment_provider_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `client_stripe` -- @@ -1331,7 +1355,6 @@ CREATE TABLE `payment_methods` ( `payment_method_id` int(11) NOT NULL AUTO_INCREMENT, `payment_method_name` varchar(200) NOT NULL, `payment_method_description` varchar(250) DEFAULT NULL, - `payment_method_provider_id` int(11) DEFAULT 0, `payment_method_created_at` datetime NOT NULL DEFAULT current_timestamp(), `payment_method_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), PRIMARY KEY (`payment_method_id`) @@ -1661,7 +1684,10 @@ CREATE TABLE `recurring_payments` ( `recurring_payment_account_id` int(11) NOT NULL, `recurring_payment_recurring_expense_id` int(11) NOT NULL DEFAULT 0, `recurring_payment_recurring_invoice_id` int(11) NOT NULL, - PRIMARY KEY (`recurring_payment_id`) + `recurring_payment_saved_payment_id` int(11) DEFAULT NULL, + PRIMARY KEY (`recurring_payment_id`), + KEY `fk_recurring_saved_payment` (`recurring_payment_saved_payment_id`), + CONSTRAINT `fk_recurring_saved_payment` FOREIGN KEY (`recurring_payment_saved_payment_id`) REFERENCES `client_saved_payment_methods` (`saved_payment_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2692,4 +2718,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-07 16:36:58 +-- Dump completed on 2025-07-08 14:06:43 diff --git a/post/admin/admin_saved_payment_method.php b/post/admin/admin_saved_payment_method.php index e697b1f2..42871b0c 100644 --- a/post/admin/admin_saved_payment_method.php +++ b/post/admin/admin_saved_payment_method.php @@ -5,66 +5,65 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); if (isset($_GET['delete_saved_payment'])) { validateCSRFToken($_GET['csrf_token']); - if (!$config_stripe_enable) { - $_SESSION['alert_message'] = "Stripe not enabled"; - header("Location: " . $_SERVER["HTTP_REFERER"]); - exit(); - } + $saved_payment_id = intval($_GET['delete_saved_payment']); - $client_id = intval($_GET['client_id']); - $payment_method = sanitizeInput($_GET['pm']); + $sql = mysqli_query($mysqli, " + SELECT + client_saved_payment_methods.saved_payment_id, + client_saved_payment_methods.saved_payment_client_id, + client_saved_payment_methods.saved_payment_provider_id, + client_saved_payment_methods.saved_payment_provider_method, + client_saved_payment_methods.saved_payment_description, + client_payment_provider.payment_provider_client, + payment_providers.payment_provider_name, + payment_providers.payment_provider_private_key + FROM client_saved_payment_methods + LEFT JOIN client_payment_provider + ON client_payment_provider.client_id = client_saved_payment_methods.saved_payment_client_id + AND client_payment_provider.payment_provider_id = client_saved_payment_methods.saved_payment_provider_id + LEFT JOIN payment_providers + ON payment_providers.payment_provider_id = client_saved_payment_methods.saved_payment_provider_id + WHERE client_saved_payment_methods.saved_payment_id = $saved_payment_id" + ); - try { - // Initialize stripe - require_once 'plugins/stripe-php/init.php'; - $stripe = new \Stripe\StripeClient($config_stripe_secret); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['saved_payment_client_id']); + $provider_id = intval($row['saved_payment_provider_id']); + $payment_provider_name = nullable_htmlentities($row['payment_provider_name']); + $saved_payment_description = nullable_htmlentities($row['saved_payment_description']); + $provider_client = nullable_htmlentities($row['payment_provider_client']); + $payment_method = $row['saved_payment_provider_method']; - // Detach PM - $stripe->paymentMethods->detach($payment_method, []); + $private_key = $row['payment_provider_private_key']; + + // Seperate logic for each Payment Provider + if ($payment_provider_name == 'Stripe') { + + try { + // Initialize stripe + require_once 'plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($private_key); + + // Detach PM + $stripe->paymentMethods->detach($payment_method, []); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); + logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + } - } catch (Exception $e) { - $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); - logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); } // Remove payment method from ITFlow - mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $client_id LIMIT 1"); + mysqli_query($mysqli, "DELETE FROM client_saved_payment_methods WHERE saved_payment_id = $saved_payment_id"); - // 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 = $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"); - } + // Remove All Associted Auto Payment Methods on recurring invoices + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_saved_payment_id = $saved_payment_id"); // Logging & Redirect - logAction("Stripe", "Update", "$session_name deleted saved Stripe payment method (PM: $payment_method)", $client_id); - $_SESSION['alert_message'] = "Payment method removed"; + logAction("Payment Provider", "Update", "$session_name deleted saved payment method $saved_payment_description (PM: $payment_method)", $client_id); + $_SESSION['alert_message'] = "Payment method $saved_payment_description removed"; header("Location: " . $_SERVER["HTTP_REFERER"]); } - -if (isset($_GET['stripe_reset_customer'])) { - validateCSRFToken($_GET['csrf_token']); - - $client_id = intval($_GET['client_id']); - - // Delete the customer id and payment method id stored in ITFlow, allowing the client to set these up again - mysqli_query($mysqli, "DELETE FROM client_stripe WHERE client_id = $client_id"); - - // 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 = $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 - logAction("Stripe", "Delete", "$session_name reset Stripe settings for client", $client_id); - - $_SESSION['alert_message'] = "Reset client Stripe settings"; - header("Location: " . $_SERVER["HTTP_REFERER"]); -} \ No newline at end of file From 307d9892b2b0e67592e9a978e718443a761d0ef0 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 8 Jul 2025 14:10:27 -0400 Subject: [PATCH 053/244] No need for a sql delete on recurring payments when deleting a saved payment method as SQL cascadely deletes the recurring payment if saved payment method is deleted --- post/admin/admin_saved_payment_method.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/post/admin/admin_saved_payment_method.php b/post/admin/admin_saved_payment_method.php index 42871b0c..90e8047b 100644 --- a/post/admin/admin_saved_payment_method.php +++ b/post/admin/admin_saved_payment_method.php @@ -58,8 +58,7 @@ if (isset($_GET['delete_saved_payment'])) { // Remove payment method from ITFlow mysqli_query($mysqli, "DELETE FROM client_saved_payment_methods WHERE saved_payment_id = $saved_payment_id"); - // Remove All Associted Auto Payment Methods on recurring invoices - mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_saved_payment_id = $saved_payment_id"); + // SQL Cascade delete will Remove All Associated Auto Payment Methods on recurring invoices in the recurring payments table. // Logging & Redirect logAction("Payment Provider", "Update", "$session_name deleted saved payment method $saved_payment_description (PM: $payment_method)", $client_id); From 9bc705bfa17c3dfe4af8380bc3cdd381697aa84b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 01:45:56 -0400 Subject: [PATCH 054/244] Updated Guest pay and Client Add Delete Payments, adjustedsetting saved payment per recurring invoice --- admin_payment_method.php | 14 +- admin_saved_payment_method.php | 54 ++- ajax/ajax_payment_method_edit.php | 22 - client/autopay.php | 134 ------ client/includes/header.php | 2 +- client/post.php | 423 ++++++++++++------ ...curring_invoice_savd_payment_add_modal.php | 0 client/recurring_invoices.php | 27 +- client/saved_payment_methods.php | 138 ++++++ guest/guest_ajax.php | 42 +- guest/guest_pay_invoice_stripe.php | 221 ++++----- modals/admin_payment_method_add_modal.php | 21 - modals/invoice_payment_add_bulk_modal.php | 3 +- post/admin/admin_payment_method.php | 6 +- 14 files changed, 562 insertions(+), 545 deletions(-) delete mode 100644 client/autopay.php create mode 100644 client/recurring_invoice_savd_payment_add_modal.php create mode 100644 client/saved_payment_methods.php diff --git a/admin_payment_method.php b/admin_payment_method.php index 781e5a16..7d3fb981 100644 --- a/admin_payment_method.php +++ b/admin_payment_method.php @@ -6,10 +6,7 @@ $order = "ASC"; require_once "includes/inc_all_admin.php"; -$sql = mysqli_query($mysqli, "SELECT * FROM payment_methods - LEFT JOIN payment_providers ON payment_method_provider_id = payment_provider_id - ORDER BY $sort $order" -); +$sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY $sort $order"); $num_rows = mysqli_num_rows($sql); @@ -38,8 +35,8 @@ $num_rows = mysqli_num_rows($sql); - - Provider + + Created at Action @@ -52,8 +49,7 @@ $num_rows = mysqli_num_rows($sql); $payment_method_id = intval($row['payment_method_id']); $payment_method_name = nullable_htmlentities($row['payment_method_name']); $payment_method_description = nullable_htmlentities($row['payment_method_description']); - $payment_provider_id = intval($row['payment_provider_id']); - $payment_provider_name = nullable_htmlentities($row['payment_provider_name']); + $payment_method_created_at = nullable_htmlentities($row['payment_method_created_at']); ?> @@ -67,7 +63,7 @@ $num_rows = mysqli_num_rows($sql); - +
    +
    • diff --git a/ajax/ajax_payment_method_edit.php b/ajax/ajax_payment_method_edit.php index fd30cea4..6499e1c0 100644 --- a/ajax/ajax_payment_method_edit.php +++ b/ajax/ajax_payment_method_edit.php @@ -10,7 +10,6 @@ $row = mysqli_fetch_array($sql); $payment_method_id = intval($row['payment_method_id']); $payment_method_name = nullable_htmlentities($row['payment_method_name']); $payment_method_description = nullable_htmlentities($row['payment_method_description']); -$payment_method_provider_id = intval($row['payment_method_provider_id']); // Generate the HTML form content using output buffering. ob_start(); @@ -40,27 +39,6 @@ ob_start();
    -
    - -
    -
    - -
    - -
    -
    -
    diff --git a/client/autopay.php b/client/autopay.php deleted file mode 100644 index e7953dde..00000000 --- a/client/autopay.php +++ /dev/null @@ -1,134 +0,0 @@ - - -

    AutoPay

    -
    - -
    - - - - - Save card details
    - In order to set up automatic payments, you must create a customer record in Stripe.
    - First, you must authorize Stripe to store your card details for the purpose of automatic payment. -

    - -
    -
    - -
    -
    - - -
    -
    - -
    - -
    -
    -
    - - - elseif (empty($stripe_pm)) { ?> - - Save card details
    - Please add the payment details you would like to save.
    - By adding payment details here, you grant consent for future automatic payments of invoices.

    - - - - -
    - -
    - - - - Manage saved payment methods - - customers->retrievePaymentMethod( - $stripe_id, - $stripe_pm, - [] - ); - - } catch (Exception $e) { - $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when fetching payment method info for $stripe_pm: $error"); - logApp("Stripe", "error", "Exception when fetching payment method info for $stripe_pm: $error"); - } - - $card_name = nullable_htmlentities($payment_method->billing_details->name); - $card_brand = nullable_htmlentities($payment_method->card->display_brand); - $card_last4 = nullable_htmlentities($payment_method->card->last4); - $card_expires = nullable_htmlentities($payment_method->card->exp_month) . "/" . nullable_htmlentities($payment_method->card->exp_year); - - ?> - -
    - -
    - Actions
    - -     Remove saved payment method - - - - -
    - -
    - - -Invoices Recurring Invoices Quotes - Auto Payment + Saved Payments
    diff --git a/client/post.php b/client/post.php index e8b5b8ed..ce9e4574 100644 --- a/client/post.php +++ b/client/post.php @@ -438,109 +438,159 @@ if (isset($_POST['create_stripe_customer'])) { exit(); } - // Get Stripe vars - $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); - $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); - $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + // Get Stripe provider + $stripe_provider_result = mysqli_query($mysqli, " + SELECT * FROM payment_providers + WHERE payment_provider_name = 'Stripe' + AND payment_provider_active = 1 + LIMIT 1 + "); - if (!$config_stripe_enable) { - header("Location: autopay.php"); + $stripe_provider = mysqli_fetch_array($stripe_provider_result); + if (!$stripe_provider) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe provider is not configured in the system."; + header("Location: saved_payment_methods.php"); exit(); } - // Include stripe SDK - require_once '../plugins/stripe-php/init.php'; + $stripe_provider_id = intval($stripe_provider['payment_provider_id']); + $stripe_secret_key = nullable_htmlentities($stripe_provider['payment_provider_private_key']); - // Get client's StripeID from database (should be none) - $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); - if (!$stripe_client_details) { + if (empty($stripe_secret_key)) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe credentials missing. Please contact support."; + header("Location: saved_payment_methods.php"); + exit(); + } + // Check if client already has a Stripe customer + $existing_customer = mysqli_fetch_array(mysqli_query($mysqli, " + SELECT payment_provider_client + FROM client_payment_provider + WHERE client_id = $session_client_id + AND payment_provider_id = $stripe_provider_id + LIMIT 1 + ")); + + if (!$existing_customer) { try { - // Initiate Stripe - $stripe = new \Stripe\StripeClient($config_stripe_secret); + // Initialize Stripe + require_once '../plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($stripe_secret_key); - // Create customer + // Create new customer in Stripe $customer = $stripe->customers->create([ 'name' => $session_client_name, 'email' => $session_contact_email, 'metadata' => [ 'itflow_client_id' => $session_client_id, - 'consent' => $session_contact_name + 'consent_by' => $session_contact_name ] ]); + $stripe_customer_id = sanitizeInput($customer->id); + + // Insert customer into client_payment_provider + mysqli_query($mysqli, " + INSERT INTO client_payment_provider + SET client_id = $session_client_id, + payment_provider_id = $stripe_provider_id, + payment_provider_client = '$stripe_customer_id', + client_payment_provider_created_at = NOW() + "); + + // Logging + logAction("Stripe", "Create", "$session_contact_name created Stripe customer for $session_client_name as $stripe_customer_id and authorized future automatic payments", $session_client_id, $session_client_id); + + $_SESSION['alert_message'] = "Stripe customer created. Thank you for your consent."; + } catch (Exception $e) { $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when creating customer record for $session_client_name: $error"); - logApp("Stripe", "error", "Exception creating customer $session_client_name: $error"); + error_log("Stripe error while creating customer for $session_client_name: $error"); + logApp("Stripe", "error", "Failed to create Stripe customer for $session_client_name: $error"); + + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "An error occurred while creating your Stripe customer. Please try again."; } - // Get & Store customer ID - $stripe_id = sanitizeInput($customer->id); - - mysqli_query($mysqli, "INSERT INTO client_stripe SET client_id = $session_client_id, stripe_id = '$stripe_id'"); - - // Logging - logAction("Stripe", "Create", "$session_contact_name created Stripe customer for $session_client_name as $stripe_id and authorised future automatic payments", $session_client_id, $session_client_id); - - $_SESSION['alert_message'] = "Stripe customer created, thank you for your consent"; - } else { $_SESSION['alert_type'] = "danger"; - $_SESSION['alert_message'] = "Stripe customer already exists"; + $_SESSION['alert_message'] = "Stripe customer already exists for your account."; } - header('Location: autopay.php'); + header('Location: saved_payment_methods.php'); } if (isset($_GET['create_stripe_checkout'])) { - // This page is called by the autopay_setup_stripe.js, it returns a checkout session client secret + // This page is called by autopay_setup_stripe.js, returns a Checkout Session client_secret if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { header("Location: post.php?logout"); exit(); } - // Get Stripe vars - $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); - $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); - $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + // Fetch Stripe provider info + $stripe_provider_result = mysqli_query($mysqli, " + SELECT * FROM payment_providers + WHERE payment_provider_name = 'Stripe' + AND payment_provider_active = 1 + LIMIT 1 + "); - if (!$config_stripe_enable) { - header("Location: autopay.php"); + $stripe_provider = mysqli_fetch_array($stripe_provider_result); + if (!$stripe_provider) { + http_response_code(400); + echo json_encode(['error' => 'Stripe provider not configured']); exit(); } - // Client Currency - $client_currency_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT client_currency_code FROM clients WHERE client_id = $session_client_id LIMIT 1")); - $client_currency = $client_currency_details['client_currency_code']; + $stripe_provider_id = intval($stripe_provider['payment_provider_id']); + $stripe_secret_key = nullable_htmlentities($stripe_provider['payment_provider_private_key']); - // Define return URL that user is redirected to once payment method is verified by Stripe + if (empty($stripe_secret_key)) { + http_response_code(400); + echo json_encode(['error' => 'Stripe secret key missing']); + exit(); + } + + // Get client currency + $client_currency_result = mysqli_query($mysqli, " + SELECT client_currency_code + FROM clients + WHERE client_id = $session_client_id + LIMIT 1 + "); + $client_currency_row = mysqli_fetch_assoc($client_currency_result); + $client_currency = $client_currency_row['client_currency_code'] ?? 'usd'; + + // Return URL when checkout finishes $return_url = "https://$config_base_url/client/post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}"; try { - // Initialize stripe require_once '../plugins/stripe-php/init.php'; - $stripe = new \Stripe\StripeClient($config_stripe_secret); + $stripe = new \Stripe\StripeClient($stripe_secret_key); - // Create checkout session (server side) + // Create checkout session $checkout_session = $stripe->checkout->sessions->create([ 'currency' => $client_currency, 'mode' => 'setup', 'ui_mode' => 'embedded', 'return_url' => $return_url, ]); + + echo json_encode(['clientSecret' => $checkout_session->client_secret]); + } catch (Exception $e) { $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when creating checkout session: $error"); - logApp("Stripe", "error", "Exception creating checkout: $error"); + error_log("Stripe error creating checkout session: $error"); + logApp("Stripe", "error", "Exception creating checkout session: $error"); + http_response_code(500); + echo json_encode(['error' => 'Stripe Checkout session failed']); } - // Return the client secret to the js script - echo json_encode(array('clientSecret' => $checkout_session->client_secret)); - - // No redirect & no point logging this + exit; } if (isset($_GET['stripe_save_card'])) { @@ -550,160 +600,245 @@ if (isset($_GET['stripe_save_card'])) { exit(); } - // Get Stripe vars - $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); - $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); - $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + // Get Stripe provider + $stripe_provider_result = mysqli_query($mysqli, " + SELECT * FROM payment_providers + WHERE payment_provider_name = 'Stripe' + AND payment_provider_active = 1 + LIMIT 1 + "); - if (!$config_stripe_enable) { - header("Location: autopay.php"); + $stripe_provider = mysqli_fetch_array($stripe_provider_result); + if (!$stripe_provider) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe provider not configured."; + header("Location: saved_payment_methods.php"); + exit(); + } + + $stripe_provider_id = intval($stripe_provider['payment_provider_id']); + $stripe_secret_key = nullable_htmlentities($stripe_provider['payment_provider_private_key']); + + if (empty($stripe_secret_key)) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe credentials missing."; + header("Location: saved_payment_methods.php"); + exit(); + } + + // Get client's Stripe customer ID + $client_provider_query = mysqli_query($mysqli, " + SELECT payment_provider_client + FROM client_payment_provider + WHERE client_id = $session_client_id + AND payment_provider_id = $stripe_provider_id + LIMIT 1 + "); + $client_provider = mysqli_fetch_array($client_provider_query); + $stripe_customer_id = sanitizeInput($client_provider['payment_provider_client'] ?? ''); + + if (empty($stripe_customer_id)) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe customer ID not found for client."; + header("Location: saved_payment_methods.php"); exit(); } // Get session ID from URL $checkout_session_id = sanitizeInput($_GET['session_id']); - // Get client's StripeID from database - $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); - $client_stripe_id = sanitizeInput($stripe_client_details['stripe_id']); - try { - // Initialize stripe require_once '../plugins/stripe-php/init.php'; - $stripe = new \Stripe\StripeClient($config_stripe_secret); + $stripe = new \Stripe\StripeClient($stripe_secret_key); - // Retrieve checkout session - $checkout_session = $stripe->checkout->sessions->retrieve($checkout_session_id,[]); - - // Get setup intent + // Retrieve checkout session & setup intent + $checkout_session = $stripe->checkout->sessions->retrieve($checkout_session_id, []); $setup_intent_id = $checkout_session->setup_intent; - - // Retrieve the setup intent details $setup_intent = $stripe->setupIntents->retrieve($setup_intent_id, []); + $payment_method_id = sanitizeInput($setup_intent->payment_method); - // Get the payment method token - $payment_method = sanitizeInput($setup_intent->payment_method); + // Attach the payment method to the Stripe customer + $stripe->paymentMethods->attach($payment_method_id, ['customer' => $stripe_customer_id]); - // Attach the payment method to the client in Stripe - $stripe->paymentMethods->attach($payment_method, ['customer' => $client_stripe_id]); + // Retrieve PM details for logging and UI + $payment_method_details = $stripe->paymentMethods->retrieve($payment_method_id, []); + $card_brand = sanitizeInput($payment_method_details->card->brand); + $last4 = sanitizeInput($payment_method_details->card->last4); + $exp_month = sanitizeInput($payment_method_details->card->exp_month); + $exp_year = sanitizeInput($payment_method_details->card->exp_year); + + $saved_payment_description = "$card_brand - $last4 | Exp $exp_month/$exp_year"; + + // Insert into client_saved_payment_methods + mysqli_query($mysqli, " + INSERT INTO client_saved_payment_methods + SET + saved_payment_provider_method = '$payment_method_id', + saved_payment_description = '$saved_payment_description', + saved_payment_client_id = $session_client_id, + saved_payment_provider_id = $stripe_provider_id, + saved_payment_created_at = NOW() + "); } catch (Exception $e) { $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when adding payment method info: $error"); - logApp("Stripe", "error", "Exception adding payment method: $error"); + error_log("Stripe error while saving payment method: $error"); + logApp("Stripe", "error", "Exception saving payment method: $error"); + + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "An error occurred while saving your payment method."; + header("Location: saved_payment_methods.php"); + exit(); } - // Update ITFlow - mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = '$payment_method' WHERE client_id = $session_client_id LIMIT 1"); - - // Get some card/payment method details for the email/logging - $payment_method_details = $stripe->paymentMethods->retrieve($payment_method); - $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"); + // Email Confirmation + $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); + $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); - $config_smtp_host = $row['config_smtp_host']; - $config_smtp_port = intval($row['config_smtp_port']); - $config_smtp_encryption = $row['config_smtp_encryption']; - $config_smtp_username = $row['config_smtp_username']; - $config_smtp_password = $row['config_smtp_password']; - $config_invoice_from_name = sanitizeInput($row['config_invoice_from_name']); $config_invoice_from_email = sanitizeInput($row['config_invoice_from_email']); - $config_base_url = sanitizeInput($config_base_url); + $config_invoice_from_name = sanitizeInput($row['config_invoice_from_name']); - if (!empty($config_smtp_host)) { + if (!empty($row['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 ($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"; + $body = "Hello $session_contact_name

    + Were writing to confirm that your payment details have been securely stored with Stripe our trusted payment processor.

    + You authorized us to automatically bill your card ($saved_payment_description) for future invoices.

    + You may update or remove your payment method at any time via the client portal.

    + Thank you for your business!

    + --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; - $data = [ - [ - 'from' => $config_invoice_from_email, - 'from_name' => $config_invoice_from_name, - 'recipient' => $session_contact_email, - 'recipient_name' => $session_contact_name, - 'subject' => $subject, - 'body' => $body, - ] - ]; + $data = [[ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $session_contact_email, + 'recipient_name' => $session_contact_name, + 'subject' => $subject, + 'body' => $body + ]]; $mail = addToMailQueue($data); - } - // Logging - 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); + // Log the action + logAction("Stripe", "Update", "$session_contact_name saved payment method ($saved_payment_description) (PM: $payment_method_id)", $session_client_id); // Redirect - $_SESSION['alert_message'] = "Payment method saved - thank you"; - header('Location: autopay.php'); + $_SESSION['alert_message'] = "Payment method saved – thank you."; + header("Location: saved_payment_methods.php"); } -if (isset($_GET['stripe_remove_pm'])) { +if (isset($_GET['delete_saved_payment'])) { if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { header("Location: post.php?logout"); exit(); } - // Get Stripe vars - $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); - $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); - $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + $saved_payment_id = intval($_GET['delete_saved_payment']); - if (!$config_stripe_enable) { - header("Location: autopay.php"); + // Get Stripe provider info + $stripe_provider_result = mysqli_query($mysqli, " + SELECT * FROM payment_providers + WHERE payment_provider_name = 'Stripe' + AND payment_provider_active = 1 + LIMIT 1 + "); + $stripe_provider = mysqli_fetch_array($stripe_provider_result); + + if (!$stripe_provider) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe provider is not configured."; + header("Location: saved_payment_methods.php"); exit(); } - $payment_method = sanitizeInput($_GET['pm']); + $stripe_provider_id = intval($stripe_provider['payment_provider_id']); + $stripe_secret_key = nullable_htmlentities($stripe_provider['payment_provider_private_key']); + + if (empty($stripe_secret_key)) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe credentials are missing."; + header("Location: saved_payment_methods.php"); + exit(); + } + + $saved_payment_result = mysqli_query($mysqli, " + SELECT saved_payment_id, saved_payment_description, saved_payment_provider_method + FROM client_saved_payment_methods + WHERE saved_payment_id = $saved_payment_id + AND saved_payment_client_id = $session_client_id + AND saved_payment_provider_id = $stripe_provider_id + LIMIT 1 + "); + + $saved_payment = mysqli_fetch_array($saved_payment_result); + + if (!$saved_payment) { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Payment method not found or does not belong to you."; + header("Location: saved_payment_methods.php"); + exit(); + } + + $payment_method_id = sanitizeInput($saved_payment['saved_payment_provider_method']); + + $saved_payment_id = intval($saved_payment['saved_payment_id']); + $saved_payment_description = nullable_htmlentities($saved_payment['saved_payment_description']); try { - // Initialize stripe + // Initialize Stripe require_once '../plugins/stripe-php/init.php'; - $stripe = new \Stripe\StripeClient($config_stripe_secret); + $stripe = new \Stripe\StripeClient($stripe_secret_key); - // Detach PM - $stripe->paymentMethods->detach($payment_method, []); + // Detach the payment method from Stripe + $stripe->paymentMethods->detach($payment_method_id, []); } catch (Exception $e) { $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); - logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + error_log("Stripe error while removing payment method $payment_method_id: $error"); + logApp("Stripe", "error", "Exception removing payment method $payment_method_id: $error"); + + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "An error occurred while removing your payment method."; + header("Location: saved_payment_methods.php"); + exit(); } - // Remove payment method from ITFlow - mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL, stripe_pm_details = NULL WHERE client_id = $session_client_id LIMIT 1"); + // Remove saved payment method from local DB + mysqli_query($mysqli, " + DELETE FROM client_saved_payment_methods + WHERE saved_payment_id = $saved_payment_id + "); - // 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"); + // Remove any auto-pay records using this payment method + $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)) { + while ($row = mysqli_fetch_array($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"); + + mysqli_query($mysqli, " + DELETE FROM recurring_payments + WHERE recurring_payment_recurring_invoice_id = $recurring_invoice_id + AND recurring_payment_saved_payment_id = $saved_payment_id + "); } - // Logging & Redirect - logAction("Stripe", "Update", "$session_contact_name deleted saved Stripe payment method (PM: $payment_method)", $session_client_id, $session_client_id); + // Log and redirect + logAction("Stripe", "Update", "$session_contact_name deleted Stripe payment method $saved_payment_description (PM: $payment_method_id)", $session_client_id); - $_SESSION['alert_message'] = "Payment method removed"; - header('Location: autopay.php'); + $_SESSION['alert_message'] = "Payment method $saved_payment_description removed."; + + header("Location: saved_payment_methods.php"); } if (isset($_POST['add_recurring_payment'])) { diff --git a/client/recurring_invoice_savd_payment_add_modal.php b/client/recurring_invoice_savd_payment_add_modal.php new file mode 100644 index 00000000..e69de29b diff --git a/client/recurring_invoices.php b/client/recurring_invoices.php index 6f0c15c1..724edd8f 100644 --- a/client/recurring_invoices.php +++ b/client/recurring_invoices.php @@ -14,12 +14,6 @@ if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { exit(); } -// Get client's StripeID from database -$stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); -if ($stripe_client_details) { - $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); -} - $recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_invoice_id WHERE recurring_invoice_client_id = $session_client_id @@ -92,17 +86,24 @@ $recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoice ly - + 0) { ?>
    - - - - - +
    - Add Card Details First + Add a Payment Method diff --git a/client/saved_payment_methods.php b/client/saved_payment_methods.php new file mode 100644 index 00000000..ebd96148 --- /dev/null +++ b/client/saved_payment_methods.php @@ -0,0 +1,138 @@ + + +

    Saved Payment Methods

    +
    +
    + + + Save card details
    + In order to set up automatic payments, you must create a customer record in Stripe.
    + First, you must authorize Stripe to store your card details for the purpose of automatic payment. +

    + +
    +
    +
    +
    + + +
    +
    + +
    + +
    +
    +
    + + + + Manage saved payment methods

    + + +

    You currently have no saved payment methods. Please add one below.

    + +
      + paymentMethods->retrieve($stripe_pm_id, []); + $brand = nullable_htmlentities($pm->card->brand); + $last4 = nullable_htmlentities($pm->card->last4); + $exp_month = nullable_htmlentities($pm->card->exp_month); + $exp_year = nullable_htmlentities($pm->card->exp_year); + + echo "
    • $brand card ending in $last4, expires $exp_month/$exp_year"; + echo " – Remove
      • "; + } + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error: $error"); + logApp("Stripe", "error", "Exception retrieving payment methods: $error"); + echo "

      Unable to retrieve payment methods from Stripe.

      "; + } + ?> +
    + + +
    + Add a new payment method

    + + + + +
    + +
    + + + +
    +
    + + diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php index 7e73c451..c7803375 100644 --- a/guest/guest_ajax.php +++ b/guest/guest_ajax.php @@ -20,7 +20,6 @@ require_once "../plugins/totp/totp.php"; if (isset($_GET['stripe_create_pi'])) { - // Response header header('Content-Type: application/json'); // Params from POST (guest_pay_invoice_stripe.js) @@ -36,16 +35,13 @@ if (isset($_GET['stripe_create_pi'])) { LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id AND invoice_url_key = '$url_key' - AND invoice_status != 'Draft' - AND invoice_status != 'Paid' - AND invoice_status != 'Cancelled' + AND invoice_status NOT IN ('Draft','Paid','Cancelled') LIMIT 1" ); if (!$invoice_sql || mysqli_num_rows($invoice_sql) !== 1) { exit("Invalid Invoice ID/SQL query"); } - // Invoice exists - get details for payment $row = mysqli_fetch_array($invoice_sql); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -54,15 +50,10 @@ if (isset($_GET['stripe_create_pi'])) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); - $config_sql = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); - $config_row = mysqli_fetch_array($config_sql); - $config_stripe_percentage_fee = floatval($config_row['config_stripe_percentage_fee']); - $config_stripe_flat_fee = floatval($config_row['config_stripe_flat_fee']); - // Add up all the payments for the invoice and get the total amount paid to the invoice $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); - $amount_paid = floatval($row['amount_paid']); + $row_amt = mysqli_fetch_array($sql_amount_paid); + $amount_paid = floatval($row_amt['amount_paid']); $balance_to_pay = $invoice_amount - $amount_paid; $balance_to_pay = round($balance_to_pay, 2); @@ -71,24 +62,22 @@ if (isset($_GET['stripe_create_pi'])) { exit("No balance outstanding"); } - // Setup Stripe - require_once '../plugins/stripe-php/init.php'; - - - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_secret, config_stripe_account FROM settings WHERE company_id = 1")); - if ($row['config_stripe_enable'] == 0 || $row['config_stripe_account'] == 0) { + // Setup Stripe from payment_providers + $stripe_provider = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM payment_providers WHERE payment_provider_name = 'Stripe' LIMIT 1")); + if (!$stripe_provider) { exit("Stripe not enabled / configured"); } + $stripe_secret_key = $stripe_provider['payment_provider_private_key']; + + require_once '../plugins/stripe-php/init.php'; - $config_stripe_secret = $row['config_stripe_secret']; $pi_description = "ITFlow: $client_name payment of $invoice_currency_code $balance_to_pay for $invoice_prefix$invoice_number"; - // Create a PaymentIntent with amount, currency and client details try { - \Stripe\Stripe::setApiKey($config_stripe_secret); + \Stripe\Stripe::setApiKey($stripe_secret_key); $paymentIntent = \Stripe\PaymentIntent::create([ - 'amount' => intval($balance_to_pay * 100), // Times by 100 as Stripe expects values in cents + 'amount' => intval($balance_to_pay * 100), // Stripe expects cents 'currency' => $invoice_currency_code, 'description' => $pi_description, 'metadata' => [ @@ -106,15 +95,10 @@ if (isset($_GET['stripe_create_pi'])) { echo json_encode($output); - } catch (Error $e) { + } catch (Exception $e) { http_response_code(500); echo json_encode(['error' => $e->getMessage()]); } -} - -if (isset($_GET['get_totp_token'])) { - $otp = TokenAuth6238::getTokenCode(strtoupper($_GET['totp_secret'])); - - echo json_encode($otp); + exit; } diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php index 4d6127bd..dcdd19a8 100644 --- a/guest/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -2,102 +2,84 @@ require_once 'includes/guest_header.php'; -// Define wording DEFINE("WORDING_PAYMENT_FAILED", "

    There was an error verifying your payment. Please contact us for more information before attempting payment again.

    "); -// Setup Stripe -$stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret, config_stripe_account, config_stripe_expense_vendor, config_stripe_expense_category, config_stripe_percentage_fee, config_stripe_flat_fee FROM settings WHERE company_id = 1")); -$config_stripe_enable = intval($stripe_vars['config_stripe_enable']); -$config_stripe_publishable = nullable_htmlentities($stripe_vars['config_stripe_publishable']); -$config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); -$config_stripe_account = intval($stripe_vars['config_stripe_account']); -$config_stripe_expense_vendor = intval($stripe_vars['config_stripe_expense_vendor']); -$config_stripe_expense_category = intval($stripe_vars['config_stripe_expense_category']); -$config_stripe_percentage_fee = floatval($stripe_vars['config_stripe_percentage_fee']); -$config_stripe_flat_fee = floatval($stripe_vars['config_stripe_flat_fee']); +// --- Get Stripe config from payment_providers table --- +$stripe_provider = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM payment_providers")); + + +$stripe_publishable = nullable_htmlentities($stripe_provider['payment_provider_public_key']); +$stripe_secret = nullable_htmlentities($stripe_provider['payment_provider_private_key']); +$stripe_account = intval($stripe_provider['payment_provider_account_id']); +$stripe_expense_vendor = intval($stripe_provider['payment_provider_expense_vendor_id']); +$stripe_expense_category = intval($stripe_provider['payment_provider_expense_category_id']); +$stripe_percentage_fee = floatval($stripe_provider['payment_provider_expense_percentage_fee']); +$stripe_flat_fee = floatval($stripe_provider['payment_provider_expense_flat_fee']); -// Check Stripe is configured -if ($config_stripe_enable == 0 || $config_stripe_account == 0 || empty($config_stripe_publishable) || empty($config_stripe_secret)) { - echo "

    Stripe payments not enabled/configured

    "; - require_once 'includes/guest_footer.php'; - error_log("Stripe payment error - disabled. Check payments are enabled, Expense account is set, Stripe publishable and secret keys are configured."); - exit(); -} // Show payment form -// Users are directed to this page with the invoice_id and url_key params to make a payment if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent'])) { $invoice_url_key = sanitizeInput($_GET['url_key']); - $invoice_id = intval($_GET['invoice_id']); + $invoice_id = intval($_GET['invoice_id']); // Query invoice details $sql = mysqli_query( $mysqli, "SELECT * FROM invoices - LEFT JOIN clients ON invoice_client_id = client_id - WHERE invoice_id = $invoice_id - AND invoice_url_key = '$invoice_url_key' - AND invoice_status != 'Draft' - AND invoice_status != 'Paid' - AND invoice_status != 'Cancelled' - LIMIT 1" + LEFT JOIN clients ON invoice_client_id = client_id + WHERE invoice_id = $invoice_id + AND invoice_url_key = '$invoice_url_key' + AND invoice_status NOT IN ('Draft', 'Paid', 'Cancelled') + LIMIT 1" ); - // Ensure we have a valid invoice + // Ensure valid invoice if (!$sql || mysqli_num_rows($sql) !== 1) { echo "

    Oops, something went wrong! Please ensure you have the correct URL and have not already paid this invoice.

    "; require_once 'includes/guest_footer.php'; - error_log("Stripe payment error - Invoice with ID $invoice_id is unknown/not eligible to be paid."); + error_log("Stripe payment error - Invoice with ID $invoice_id not found or not eligible."); exit(); } - // Process invoice, client and company details/settings $row = mysqli_fetch_array($sql); - $invoice_id = intval($row['invoice_id']); - $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); - $invoice_number = intval($row['invoice_number']); - $invoice_status = nullable_htmlentities($row['invoice_status']); - $invoice_date = nullable_htmlentities($row['invoice_date']); - $invoice_due = nullable_htmlentities($row['invoice_due']); - $invoice_discount = floatval($row['invoice_discount_amount']); - $invoice_amount = floatval($row['invoice_amount']); + $invoice_id = intval($row['invoice_id']); + $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_status = nullable_htmlentities($row['invoice_status']); + $invoice_date = nullable_htmlentities($row['invoice_date']); + $invoice_due = nullable_htmlentities($row['invoice_due']); + $invoice_discount = floatval($row['invoice_discount_amount']); + $invoice_amount = floatval($row['invoice_amount']); $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']); - $client_id = intval($row['client_id']); - $client_name = nullable_htmlentities($row['client_name']); - - $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); - $row = mysqli_fetch_array($sql); - $company_locale = nullable_htmlentities($row['company_locale']); + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); - // Add up all the payments for the invoice and get the total amount paid to the invoice + // Company info for currency formatting, etc + $sql_company = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); + $company_row = mysqli_fetch_array($sql_company); + $company_locale = nullable_htmlentities($company_row['company_locale']); + $config_base_url = nullable_htmlentities($company_row['company_base_url'] ?? ''); // You might want to pull from settings if needed + + // Add up all payments made to the invoice $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); - $amount_paid = floatval($row['amount_paid']); - $balance_to_pay = $invoice_amount - $amount_paid; - - //Round balance to pay to 2 decimal places - $balance_to_pay = round($balance_to_pay, 2); + $amount_paid = floatval(mysqli_fetch_array($sql_amount_paid)['amount_paid']); + $balance_to_pay = round($invoice_amount - $amount_paid, 2); // Get invoice items $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_id ASC"); - // Set Currency Formatting + // Currency formatting $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY); ?> - + - -
    - -
    -

    Payment for Invoice:

    @@ -113,47 +95,39 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent - + ?> - - 0) { ?> + 0) { ?> Discount - - 0) { ?> + + 0) { ?> Paid - - +
    - -
    @@ -161,12 +135,10 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
    - + -
    - -
    +

    - -
    - client_secret !== $pi_cs) { @@ -208,13 +172,11 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent } elseif ($pi_obj->status !== "succeeded") { exit(WORDING_PAYMENT_FAILED); } elseif ($pi_obj->amount !== $pi_obj->amount_received) { - // The invoice wasn't paid in full - // this should be flagged for manual review as would indicate something weird happening error_log("Stripe payment error - payment amount does not match amount paid for $pi_id"); exit(WORDING_PAYMENT_FAILED); } - // Get details from PI + // PI details $pi_date = date('Y-m-d', $pi_obj->created); $pi_invoice_id = intval($pi_obj->metadata->itflow_invoice_id); $pi_client_id = intval($pi_obj->metadata->itflow_client_id); @@ -226,20 +188,17 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent $invoice_sql = mysqli_query( $mysqli, "SELECT * FROM invoices - LEFT JOIN clients ON invoice_client_id = client_id - LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 - WHERE invoice_id = $pi_invoice_id - AND invoice_status != 'Draft' - AND invoice_status != 'Paid' - AND invoice_status != 'Cancelled' - LIMIT 1" + LEFT JOIN clients ON invoice_client_id = client_id + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE invoice_id = $pi_invoice_id + AND invoice_status NOT IN ('Draft', 'Paid', 'Cancelled') + LIMIT 1" ); if (!$invoice_sql || mysqli_num_rows($invoice_sql) !== 1) { - error_log("Stripe payment error - Invoice with ID $invoice_id is unknown/not eligible to be paid. PI $pi_id"); + error_log("Stripe payment error - Invoice with ID $pi_invoice_id is unknown/not eligible. PI $pi_id"); exit(WORDING_PAYMENT_FAILED); } - // Invoice exists - get details $row = mysqli_fetch_array($invoice_sql); $invoice_id = intval($row['invoice_id']); $invoice_prefix = sanitizeInput($row['invoice_prefix']); @@ -251,48 +210,35 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); - + $sql_company = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); $row = mysqli_fetch_array($sql_company); - $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); $company_locale = sanitizeInput($row['company_locale']); - // Set Currency Formatting $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY); - // Add up all the payments for the invoice and get the total amount paid to the invoice already (if any) $sql_amount_paid_previously = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid_previously); - $amount_paid_previously = $row['amount_paid']; + $amount_paid_previously = floatval(mysqli_fetch_array($sql_amount_paid_previously)['amount_paid']); $balance_to_pay = $invoice_amount - $amount_paid_previously; - // Check to see if Expense Fields are configured to create Stripe payment expense - if ($config_stripe_expense_vendor > 0 && $config_stripe_expense_category > 0) { - // Calculate gateway expense fee - $gateway_fee = round($balance_to_pay * $config_stripe_percentage_fee + $config_stripe_flat_fee, 2); - - // Add Expense - mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$invoice_currency_code', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id'"); + // Stripe expense + if ($stripe_expense_vendor > 0 && $stripe_expense_category > 0) { + $gateway_fee = round($balance_to_pay * $stripe_percentage_fee + $stripe_flat_fee, 2); + mysqli_query($mysqli, "INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$invoice_currency_code', expense_account_id = $stripe_account, expense_vendor_id = $stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id'"); } - // Round balance to pay to 2 decimal places - $balance_to_pay = round($balance_to_pay, 2); - - // Sanity check that the amount paid is exactly the invoice outstanding balance if (intval($balance_to_pay) !== intval($pi_amount_paid)) { error_log("Stripe payment error - Invoice balance does not match amount paid for $pi_id"); exit(WORDING_PAYMENT_FAILED); } - // Apply payment - // Update Invoice Status mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); // Add Payment to History - mysqli_query($mysqli, "INSERT INTO payments SET payment_date = '$pi_date', payment_amount = $pi_amount_paid, payment_currency_code = '$pi_currency', payment_account_id = $config_stripe_account, payment_method = 'Stripe', payment_reference = 'Stripe - $pi_id', payment_invoice_id = $invoice_id"); + mysqli_query($mysqli, "INSERT INTO payments SET payment_date = '$pi_date', payment_amount = $pi_amount_paid, payment_currency_code = '$pi_currency', payment_account_id = $stripe_account, payment_method = 'Stripe', payment_reference = 'Stripe - $pi_id', payment_invoice_id = $invoice_id"); mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Online Payment added (client) - $ip - $os - $browser', history_invoice_id = $invoice_id"); // Notify @@ -300,30 +246,20 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent customAction('invoice_pay', $invoice_id); - // Logging $extended_log_desc = ''; if (!$pi_livemode) { $extended_log_desc = '(DEV MODE)'; } - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Payment', log_action = 'Create', log_description = 'Stripe payment of $pi_currency $pi_amount_paid against invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $pi_client_id"); - - - // Send email receipt + // Email Receipt $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_settings); + $settings = mysqli_fetch_array($sql_settings); - $config_smtp_host = $row['config_smtp_host']; - $config_smtp_port = intval($row['config_smtp_port']); - $config_smtp_encryption = $row['config_smtp_encryption']; - $config_smtp_username = $row['config_smtp_username']; - $config_smtp_password = $row['config_smtp_password']; - $config_invoice_from_name = sanitizeInput($row['config_invoice_from_name']); - $config_invoice_from_email = sanitizeInput($row['config_invoice_from_email']); - $config_invoice_paid_notification_email = sanitizeInput($row['config_invoice_paid_notification_email']); - - $config_base_url = sanitizeInput($config_base_url); + $config_smtp_host = $settings['config_smtp_host']; + $config_invoice_from_name = sanitizeInput($settings['config_invoice_from_name']); + $config_invoice_from_email = sanitizeInput($settings['config_invoice_from_email']); + $config_invoice_paid_notification_email = sanitizeInput($settings['config_invoice_paid_notification_email']); if (!empty($config_smtp_host)) { $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; @@ -339,36 +275,29 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent 'body' => $body, ] ]; - - - // Email the internal notification address too + // Internal notification if (!empty($config_invoice_paid_notification_email)) { - $subject = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; - $body = "Hello,

    This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    Hello $contact_name,

    We have received online payment for the amount of " . $pi_currency . $pi_amount_paid . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; - + $subject_internal = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; + $body_internal = "This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    $body"; $data[] = [ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, 'recipient' => $config_invoice_paid_notification_email, 'recipient_name' => $contact_name, - 'subject' => $subject, - 'body' => $body, + 'subject' => $subject_internal, + 'body' => $body_internal, ]; } - $mail = addToMailQueue($data); - // Email logging mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id"); - } // Redirect user to invoice - header('Location: //' . $config_base_url . '/guest/guest_view_invoice.php?invoice_id=' . $pi_invoice_id . '&url_key=' . $invoice_url_key); + header('Location: //' . $config_base_url . '/guest/guest_view_invoice.php?invoice_id=' . $invoice_id . '&url_key=' . $invoice_url_key); } else { exit(WORDING_PAYMENT_FAILED); } - require_once 'includes/guest_footer.php'; diff --git a/modals/admin_payment_method_add_modal.php b/modals/admin_payment_method_add_modal.php index 9703b0f9..8a913611 100644 --- a/modals/admin_payment_method_add_modal.php +++ b/modals/admin_payment_method_add_modal.php @@ -26,27 +26,6 @@
    -
    - -
    -
    - -
    - -
    -
    -
    diff --git a/modals/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php index 4bffe1db..346d0d9f 100644 --- a/modals/invoice_payment_add_bulk_modal.php +++ b/modals/invoice_payment_add_bulk_modal.php @@ -102,9 +102,8 @@ diff --git a/post/admin/admin_payment_method.php b/post/admin/admin_payment_method.php index 6e51d94a..a70fb948 100644 --- a/post/admin/admin_payment_method.php +++ b/post/admin/admin_payment_method.php @@ -12,9 +12,8 @@ if (isset($_POST['add_payment_method'])) { $name = sanitizeInput($_POST['name']); $description = sanitizeInput($_POST['description']); - $provider = intval($_POST['provider']); - mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = '$name', payment_method_description = '$description', payment_method_provider_id = $provider"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = '$name', payment_method_description = '$description'"); // Logging logAction("Payment Method", "Create", "$session_name created Payment Method $name"); @@ -32,9 +31,8 @@ if (isset($_POST['edit_payment_method'])) { $payment_method_id = intval($_POST['payment_method_id']); $name = sanitizeInput($_POST['name']); $description = sanitizeInput($_POST['description']); - $provider = intval($_POST['provider']); - mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description', payment_method_provider_id = $provider_id WHERE payment_method_id = $payment_method_id"); + mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description' WHERE payment_method_id = $payment_method_id"); // Logging logAction("Payment Method", "Edit", "$session_name edited Payment Method $name"); From 10fd74b4c4f673ce33285953e4b509ee3b745a70 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 01:46:56 -0400 Subject: [PATCH 055/244] Remove unused model --- client/recurring_invoice_savd_payment_add_modal.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 client/recurring_invoice_savd_payment_add_modal.php diff --git a/client/recurring_invoice_savd_payment_add_modal.php b/client/recurring_invoice_savd_payment_add_modal.php deleted file mode 100644 index e69de29b..00000000 From 5f94543d9b96455ae3c97afadc7b7aa5659ffad9 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 15:58:13 -0400 Subject: [PATCH 056/244] Add Easy Select Auto Pay option in Client Portal Recurring Invoices, fix guest pay --- client/post.php | 67 +++++++++++++++++------------- client/recurring_invoices.php | 10 +++-- guest/guest_pay_invoice_stripe.php | 6 +-- 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/client/post.php b/client/post.php index ce9e4574..4fc5f841 100644 --- a/client/post.php +++ b/client/post.php @@ -841,52 +841,59 @@ if (isset($_GET['delete_saved_payment'])) { header("Location: saved_payment_methods.php"); } -if (isset($_POST['add_recurring_payment'])) { +if (isset($_POST['set_recurring_payment'])) { $recurring_invoice_id = intval($_POST['recurring_invoice_id']); + $saved_payment_id = intval($_POST['saved_payment_id']); - // Get Recurring Info for logging and alerting - $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); + // Get Recurring Invoice Info for logging and alerting + $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id AND recurring_invoice_client_id = $session_client_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']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); - 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"); + if ($saved_payment_id) { - // Get Payment ID for reference - $recurring_payment_id = mysqli_insert_id($mysqli); + // Get Payment provider and method + $sql = mysqli_query($mysqli, " + SELECT * FROM payment_providers + LEFT JOIN client_saved_payment_methods ON saved_payment_provider_id = payment_provider_id + WHERE saved_payment_id = $saved_payment_id + AND saved_payment_client_id = $session_client_id + AND payment_provider_active = 1 + "); - // 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); + $row = mysqli_fetch_array($sql); + $provider_id = intval($row['payment_provider_id']); + $provider_name = sanitizeInput($row['payment_provider_name']); + $account_id = intval($row['payment_provider_account']); + $saved_payment_description = sanitizeInput($row['saved_payment_description']); - $_SESSION['alert_message'] = "Automatic Payment enabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$recurring_invoice_currency_code', recurring_payment_account_id = $account_id, recurring_payment_method = 'Credit Card', recurring_payment_recurring_invoice_id = $recurring_invoice_id, recurring_payment_saved_payment_id = $saved_payment_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 $saved_payment_description enabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + } else { + // Delete + 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 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 Disabled 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"]); - -} - if (isset($_POST['client_add_document'])) { // Permission check - only primary or technical contacts can create documents diff --git a/client/recurring_invoices.php b/client/recurring_invoices.php index 724edd8f..a5403e95 100644 --- a/client/recurring_invoices.php +++ b/client/recurring_invoices.php @@ -4,7 +4,7 @@ * Invoices for PTC */ -header("Content-Security-Policy: default-src 'self'"); +// header("Content-Security-Policy: default-src 'self'"); -- JQ 2025-07-09 - BREAKS onchange(submit) require_once "includes/inc_all.php"; @@ -54,6 +54,7 @@ $recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoice $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); $recurring_payment_id = intval($row['recurring_payment_id']); $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + $recurring_payment_saved_payment_id = intval($row['recurring_payment_saved_payment_id']); if ($config_stripe_enable) { if ($recurring_payment_recurring_invoice_id) { $auto_pay_display = " @@ -89,16 +90,17 @@ $recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoice 0) { ?> + - + - + diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php index dcdd19a8..9fbf4ae7 100644 --- a/guest/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -10,9 +10,9 @@ $stripe_provider = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM payme $stripe_publishable = nullable_htmlentities($stripe_provider['payment_provider_public_key']); $stripe_secret = nullable_htmlentities($stripe_provider['payment_provider_private_key']); -$stripe_account = intval($stripe_provider['payment_provider_account_id']); -$stripe_expense_vendor = intval($stripe_provider['payment_provider_expense_vendor_id']); -$stripe_expense_category = intval($stripe_provider['payment_provider_expense_category_id']); +$stripe_account = intval($stripe_provider['payment_provider_account']); +$stripe_expense_vendor = intval($stripe_provider['payment_provider_expense_vendor']); +$stripe_expense_category = intval($stripe_provider['payment_provider_expense_category']); $stripe_percentage_fee = floatval($stripe_provider['payment_provider_expense_percentage_fee']); $stripe_flat_fee = floatval($stripe_provider['payment_provider_expense_flat_fee']); From 31a89c06419cc3e7f30fb69f27f6a9b1e1b4eaad Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 17:05:56 -0400 Subject: [PATCH 057/244] Update Recurring Payment Auto pay in cron --- scripts/cron.php | 251 +++++++++++++++++++++++------------------------ 1 file changed, 125 insertions(+), 126 deletions(-) diff --git a/scripts/cron.php b/scripts/cron.php index 41c51a4e..69f2feab 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -741,16 +741,16 @@ while ($row = mysqli_fetch_array($sql_invalid_recurring_invoices)) { // Start Recurring Payments -//Loop through all invoices that match today's due date and is unpaid and has automatic payment turned on -$sql_recurring_payments = mysqli_query($mysqli, "SELECT * FROM recurring_payments +$sql_recurring_payments = mysqli_query($mysqli, " + SELECT * FROM recurring_payments LEFT JOIN invoices ON invoice_recurring_invoice_id = recurring_payment_recurring_invoice_id LEFT JOIN clients ON client_id = invoice_client_id LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1 - WHERE invoice_due = CURDATE() AND (invoice_status = 'Sent' OR invoice_status = 'Viewed') + WHERE invoice_due = CURDATE() + AND (invoice_status = 'Sent' OR invoice_status = 'Viewed') "); while ($row = mysqli_fetch_array($sql_recurring_payments)) { - $invoice_id = intval($row['invoice_id']); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -762,159 +762,158 @@ while ($row = mysqli_fetch_array($sql_recurring_payments)) { $recurring_payment_account_id = intval($row['recurring_payment_account_id']); $recurring_payment_method = sanitizeInput($row['recurring_payment_method']); $recurring_payment_currency_code = sanitizeInput($row['recurring_payment_currency_code']); + $recurring_payment_saved_payment_id = intval($row['recurring_payment_saved_payment_id']); $client_id = intval($row['client_id']); $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); - // Create Payment from Auto Payment + // Only attempt autopay if a saved payment method is set + if ($recurring_payment_saved_payment_id) { + // Get the saved payment method and provider details + $saved_payment = mysqli_fetch_array(mysqli_query($mysqli, " + SELECT * FROM client_saved_payment_methods + LEFT JOIN payment_providers ON saved_payment_provider_id = payment_provider_id + WHERE saved_payment_id = $recurring_payment_saved_payment_id + AND saved_payment_client_id = $client_id + AND payment_provider_active = 1 + LIMIT 1 + ")); - // Handle Stripe payment - if ($recurring_payment_method == "Stripe") { - - // Get Stripe info for client - $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); - $stripe_id = sanitizeInput($stripe_client_details['stripe_id']); - $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); + if (!$saved_payment) { + logAction("Invoice", "Payment", "Failed auto Payment for invoice $invoice_prefix$invoice_number: Saved payment method not found or provider inactive", $client_id, $invoice_id); + continue; + } - if ($config_stripe_enable && $stripe_id && $stripe_pm) { + $provider_id = intval($saved_payment['payment_provider_id']); + $provider_name = sanitizeInput($saved_payment['payment_provider_name']); + $provider_private_key = $saved_payment['payment_provider_private_key']; + $account_id = intval($saved_payment['payment_provider_account']); + $saved_payment_description = sanitizeInput($saved_payment['saved_payment_description']); + $stripe_payment_method_id = $saved_payment['saved_payment_provider_method']; - // Initialize - require_once __DIR__ . '/../plugins/stripe-php/init.php'; - $stripe = new \Stripe\StripeClient($config_stripe_secret); + // NEW: Get the payment_provider_client (Stripe Customer ID) from client_payment_provider + $cpp_query = mysqli_query($mysqli, " + SELECT payment_provider_client FROM client_payment_provider + WHERE client_id = $client_id + AND payment_provider_id = $provider_id + LIMIT 1 + "); + $cpp_row = mysqli_fetch_array($cpp_query); + $stripe_customer_id = $cpp_row ? sanitizeInput($cpp_row['payment_provider_client']) : ''; - $balance_to_pay = round($invoice_amount, 2); - $pi_description = "ITFlow: $client_name payment of $recurring_payment_currency_code $balance_to_pay for $invoice_prefix$invoice_number"; + // Stripe + if ($provider_name === "Stripe") { + if ($provider_private_key && $stripe_customer_id && $stripe_payment_method_id) { + require_once __DIR__ . '/../plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($provider_private_key); - // Create a payment intent - try { - $payment_intent = $stripe->paymentIntents->create([ - 'amount' => intval($balance_to_pay * 100), // Times by 100 as Stripe expects values in cents - 'currency' => $recurring_payment_currency_code, - 'customer' => $stripe_id, - 'payment_method' => $stripe_pm, - 'off_session' => true, - 'confirm' => true, - 'description' => $pi_description, - 'metadata' => [ - 'itflow_client_id' => $client_id, - 'itflow_client_name' => $client_name, - 'itflow_invoice_number' => $invoice_prefix . $invoice_number, - 'itflow_invoice_id' => $invoice_id, - ] - ]); + $balance_to_pay = round($invoice_amount, 2); + $pi_description = "ITFlow: $client_name payment of $recurring_payment_currency_code $balance_to_pay for $invoice_prefix$invoice_number"; - // Get details from PI - $pi_id = sanitizeInput($payment_intent->id); - $pi_date = date('Y-m-d', $payment_intent->created); - $pi_amount_paid = floatval(($payment_intent->amount_received / 100)); - $pi_currency = strtoupper(sanitizeInput($payment_intent->currency)); - $pi_livemode = $payment_intent->livemode; + try { + $payment_intent = $stripe->paymentIntents->create([ + 'amount' => intval($balance_to_pay * 100), + 'currency' => $recurring_payment_currency_code, + 'customer' => $stripe_customer_id, + 'payment_method' => $stripe_payment_method_id, + 'off_session' => true, + 'confirm' => true, + 'description' => $pi_description, + 'metadata' => [ + 'itflow_client_id' => $client_id, + 'itflow_client_name' => $client_name, + 'itflow_invoice_number' => $invoice_prefix . $invoice_number, + 'itflow_invoice_id' => $invoice_id, + ] + ]); - } catch (Exception $e) { - $error = $e->getMessage(); - error_log("Stripe payment error - encountered exception during payment intent for invoice ID $invoice_id / $invoice_prefix$invoice_number: $error"); - logApp("Stripe", "error", "Exception during PI for invoice ID $invoice_id: $error"); - echo $error; - } + $pi_id = sanitizeInput($payment_intent->id); + $pi_date = date('Y-m-d', $payment_intent->created); + $pi_amount_paid = floatval($payment_intent->amount_received / 100); + $pi_currency = strtoupper(sanitizeInput($payment_intent->currency)); + $pi_livemode = $payment_intent->livemode; - if ($payment_intent->status == "succeeded" && intval($balance_to_pay) == intval($pi_amount_paid)) { + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception during payment intent for invoice ID $invoice_id / $invoice_prefix$invoice_number: $error"); + logApp("Stripe", "error", "Exception during PI for invoice ID $invoice_id: $error"); + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe autopay failed due to payment error', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Failed auto Payment amount of invoice $invoice_prefix$invoice_number due to Stripe payment error: $error", $client_id, $invoice_id); + continue; + } - // Update Invoice Status - mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); + if ($payment_intent->status == "succeeded" && intval($balance_to_pay) == intval($pi_amount_paid)) { - // Add Payment to History - mysqli_query($mysqli, "INSERT INTO payments SET payment_date = '$pi_date', payment_amount = $pi_amount_paid, payment_currency_code = '$pi_currency', payment_account_id = $recurring_payment_account_id, payment_method = 'Stripe', payment_reference = 'Stripe - $pi_id', payment_invoice_id = $invoice_id"); - mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Online Payment added (autopay)', history_invoice_id = $invoice_id"); + // Update Invoice Status + mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); - // Email receipt - if (!empty($config_smtp_host)) { - $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + // Add Payment to History + mysqli_query($mysqli, "INSERT INTO payments SET payment_date = '$pi_date', payment_amount = $pi_amount_paid, payment_currency_code = '$pi_currency', payment_account_id = $account_id, payment_method = 'Stripe', payment_reference = 'Stripe - $pi_id', payment_invoice_id = $invoice_id"); + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Online Payment added (autopay)', history_invoice_id = $invoice_id"); - // Queue Mail - $data = [ - [ + // EXPENSE: Stripe gateway fee as an expense (if configured) + if ($config_stripe_expense_vendor > 0 && $config_stripe_expense_category > 0) { + $gateway_fee = round($invoice_amount * $config_stripe_percentage_fee + $config_stripe_flat_fee, 2); + mysqli_query($mysqli, "INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$pi_currency', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number in the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id'"); + } + + // RECEIPT EMAIL + if (!empty($config_smtp_host)) { + $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name

    We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + $data = [[ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, 'recipient' => $contact_email, 'recipient_name' => $contact_name, 'subject' => $subject, 'body' => $body, - ] - ]; + ]]; - // Email the internal notification address too - if (!empty($config_invoice_paid_notification_email)) { - $subject = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; - $body = "Hello,

    This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    Hello $contact_name,

    We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; - - $data[] = [ - 'from' => $config_invoice_from_email, - 'from_name' => $config_invoice_from_name, - 'recipient' => $config_invoice_paid_notification_email, - 'recipient_name' => $contact_name, - 'subject' => $subject, - 'body' => $body, - ]; + // Internal notification + if (!empty($config_invoice_paid_notification_email)) { + $subject_int = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; + $body_int = "This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    $body"; + $data[] = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $config_invoice_paid_notification_email, + 'recipient_name' => $contact_name, + 'subject' => $subject_int, + 'body' => $body_int, + ]; + } + $mail = addToMailQueue($data); + $email_id = mysqli_insert_id($mysqli); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); } - $mail = addToMailQueue($data); + // LOGGING + $extended_log_desc = !$pi_livemode ? '(DEV MODE)' : ''; + appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id); + logAction("Invoice", "Payment", "Auto Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id); + customAction('invoice_pay', $invoice_id); - // Email Logging - $email_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); - logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + } else { + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe autopay failed: Status {$payment_intent->status}', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Failed auto Payment for invoice $invoice_prefix$invoice_number. Stripe PI status: {$payment_intent->status}", $client_id, $invoice_id); } - - // Log info - $extended_log_desc = ''; - if (!$pi_livemode) { - $extended_log_desc = '(DEV MODE)'; - } - - // Create Stripe payment gateway fee as an expense (if configured) - if ($config_stripe_expense_vendor > 0 && $config_stripe_expense_category > 0) { - $gateway_fee = round($invoice_amount * $config_stripe_percentage_fee + $config_stripe_flat_fee, 2); - mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$company_currency', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id $extended_log_desc'"); - } - - // Notify/log - appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id); - logAction("Invoice", "Payment", "Auto Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id); - customAction('invoice_pay', $invoice_id); - - } else { - mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe autopay failed due to payment error', history_invoice_id = $invoice_id"); - logAction("Invoice", "Payment", "Failed auto Payment amount of invoice $invoice_prefix$invoice_number due to Stripe payment error", $client_id, $invoice_id); - } - - } else { - logAction("Invoice", "Payment", "Failed auto Payment amount of invoice $invoice_prefix$invoice_number due to Stripe configuration error", $client_id, $invoice_id); - } - + } // End if Stripe creds and IDs + } // End if Stripe provider + // Add other provider logic here as needed } else { - // Else: Cash/Bank payment - - //TODO: Should we send a receipt for auto bank payments, even when nobody actually confirms receipt? - - mysqli_query($mysqli,"INSERT INTO payments SET payment_date = CURDATE(), payment_amount = $invoice_amount, payment_currency_code = '$recurring_payment_currency_code', payment_account_id = $recurring_payment_account_id, payment_method = '$recurring_payment_method', payment_reference = 'Paid via AutoPay', payment_invoice_id = $invoice_id"); - - // Get Payment ID for reference + // Handle Non-payment-provider autopay + mysqli_query($mysqli, "INSERT INTO payments SET payment_date = CURDATE(), payment_amount = $invoice_amount, payment_currency_code = '$recurring_payment_currency_code', payment_account_id = $recurring_payment_account_id, payment_method = '$recurring_payment_method', payment_reference = 'Paid via AutoPay', payment_invoice_id = $invoice_id"); $payment_id = mysqli_insert_id($mysqli); - // Update Invoice Status - mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); - - //Add Payment to History - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Paid', history_description = 'Payment added via Auto Pay', history_invoice_id = $invoice_id"); - - // Logging - logAction("Invoice", "Payment", "Auto Payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " added to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id); - } // End Payment Ifs - -} // End Recurring Payments - + mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Paid' WHERE invoice_id = $invoice_id"); + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Payment added via Auto Pay', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Auto Payment amount of $recurring_payment_currency_code $invoice_amount added to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id); + } +} // Recurring Expenses // Loop through all recurring expenses that match today's date and is active From 467c68111702fd3d096c076e9ea0160524aa5f47 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 19:23:12 -0400 Subject: [PATCH 058/244] Add Saved Payment Options to recurring invoices and details for agents --- client/recurring_invoices.php | 17 ----------- modals/account_add_modal.php | 1 + post/user/invoice.php | 53 +++++++++++++++++++++++++++++++++++ recurring_invoice.php | 30 +++++++++++++++++++- recurring_invoices.php | 24 +++++++++++++++- tickets_list.php | 6 ++++ 6 files changed, 112 insertions(+), 19 deletions(-) diff --git a/client/recurring_invoices.php b/client/recurring_invoices.php index a5403e95..fd362f92 100644 --- a/client/recurring_invoices.php +++ b/client/recurring_invoices.php @@ -55,23 +55,6 @@ $recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoice $recurring_payment_id = intval($row['recurring_payment_id']); $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); $recurring_payment_saved_payment_id = intval($row['recurring_payment_saved_payment_id']); - if ($config_stripe_enable) { - if ($recurring_payment_recurring_invoice_id) { - $auto_pay_display = " - Yes - - - - "; - } else { - $auto_pay_display = " - - Create - - "; - //require "recurring_payment_add_modal.php"; - } - } if (empty($recurring_invoice_scope)) { $recurring_invoice_scope_display = "-"; diff --git a/modals/account_add_modal.php b/modals/account_add_modal.php index f9afec38..f7ac138a 100644 --- a/modals/account_add_modal.php +++ b/modals/account_add_modal.php @@ -29,6 +29,7 @@
    +
    diff --git a/post/user/invoice.php b/post/user/invoice.php index 5a7dbc3c..4cad3f3f 100644 --- a/post/user/invoice.php +++ b/post/user/invoice.php @@ -1607,6 +1607,59 @@ if (isset($_GET['force_recurring'])) { } +if (isset($_POST['set_recurring_payment'])) { + + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); + $saved_payment_id = intval($_POST['saved_payment_id']); + + // Get Recurring Invoice 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); + $client_id = intval($row['recurring_invoice_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + + if ($saved_payment_id) { + + // Get Payment provider and method + $sql = mysqli_query($mysqli, " + SELECT * FROM payment_providers + LEFT JOIN client_saved_payment_methods ON saved_payment_provider_id = payment_provider_id + WHERE saved_payment_id = $saved_payment_id + "); + + $row = mysqli_fetch_array($sql); + + $provider_id = intval($row['payment_provider_id']); + $provider_name = sanitizeInput($row['payment_provider_name']); + $account_id = intval($row['payment_provider_account']); + $saved_payment_description = sanitizeInput($row['saved_payment_description']); + + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$recurring_invoice_currency_code', recurring_payment_account_id = $account_id, recurring_payment_method = 'Credit Card', recurring_payment_recurring_invoice_id = $recurring_invoice_id, recurring_payment_saved_payment_id = $saved_payment_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), $client_id, $recurring_invoice_id); + + $_SESSION['alert_message'] = "Automatic Payment $saved_payment_description enabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + } else { + // Delete + 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 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), $client_id, $recurring_invoice_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Automatic Payment Disabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['export_invoices_csv'])) { if (isset($_POST['client_id'])) { $client_id = intval($_POST['client_id']); diff --git a/recurring_invoice.php b/recurring_invoice.php index 260c2d9d..1dca858b 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -78,6 +78,7 @@ if (isset($_GET['recurring_invoice_id'])) { $recurring_payment_id = intval($row['recurring_payment_id']); $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); $recurring_payment_method = nullable_htmlentities($row['recurring_payment_method']); + $recurring_payment_saved_payment_id = intval($row['recurring_payment_saved_payment_id']); // Override Tab Title // No Sanitizing needed as this var will only be used in the tab title $tab_title = $row['client_name']; @@ -137,7 +138,7 @@ if (isset($_GET['recurring_invoice_id'])) {
    -
    +
    Email Notify @@ -158,6 +159,33 @@ if (isset($_GET['recurring_invoice_id'])) {
    +
    + 0) { ?> +
    + + +
    +
    + +
    + +
    +
    + + Add a Payment Method + +
    diff --git a/recurring_invoices.php b/recurring_invoices.php index 3a3dc282..dda221a6 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -202,6 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $recurring_payment_id = intval($row['recurring_payment_id']); $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + $recurring_payment_saved_payment_id = intval($row['recurring_payment_saved_payment_id']); if ($recurring_payment_recurring_invoice_id) { $auto_pay_display = " Yes @@ -235,7 +236,28 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ly - + + 0) { ?> +
    + + + +
    + + Add a Payment Method + + diff --git a/tickets_list.php b/tickets_list.php index 281a452b..ceb29df0 100644 --- a/tickets_list.php +++ b/tickets_list.php @@ -134,6 +134,8 @@ $contact_display = ""; } + $ticket_invoice_id = intval($row['ticket_invoice_id']); + // Get who last updated the ticket - to be shown in the last Response column // Defaults to prevent undefined errors @@ -227,6 +229,9 @@ = 2) { ?> + + Invoiced + + From 300aef413ce8cf38339380bd1a38f13f396ea8d3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 19:32:24 -0400 Subject: [PATCH 059/244] Fixed Email Notify not showing for recurring invoice --- recurring_invoice.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recurring_invoice.php b/recurring_invoice.php index 1dca858b..a308e9f7 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -139,12 +139,10 @@ if (isset($_GET['recurring_invoice_id'])) {
    - - - Email Notify - - Email Notify - + + Email Notify + + Email Notify From fe8baf2ca495792080d5b4fb1ba3011f40e7f2fb Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 20:06:22 -0400 Subject: [PATCH 060/244] Fix pointer not switch to a finger when hovering over add contact in ticket details --- ticket.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ticket.php b/ticket.php index 7717a10b..d8d06b0c 100644 --- a/ticket.php +++ b/ticket.php @@ -441,9 +441,10 @@ if (isset($_GET['ticket_id'])) {
    Add Contact From a7b2522c87abd1a5cfe5c91e3f0c42c14580dfdb Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Jul 2025 20:10:08 -0400 Subject: [PATCH 061/244] Fix Invoice Link in ticket details when billed --- ticket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ticket.php b/ticket.php index d8d06b0c..d638c733 100644 --- a/ticket.php +++ b/ticket.php @@ -537,7 +537,7 @@ if (isset($_GET['ticket_id'])) {
    - Invoiced: + Invoiced:
    From 35cbfdd7366b4a9418bf88abda4883d698679a5d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 10 Jul 2025 16:04:52 -0400 Subject: [PATCH 062/244] Rework Categories into a select box for tickets, which now makes it easier to see what category your viewing and one less click as the form auto submits upon selection --- products.php | 3 --- tickets.php | 65 +++++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/products.php b/products.php index 227f5c5b..6befd94d 100644 --- a/products.php +++ b/products.php @@ -19,9 +19,6 @@ if (isset($_GET['category']) & !empty($_GET['category'])) { $category_filter = ''; } -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM products diff --git a/tickets.php b/tickets.php index 89429b1a..98332d43 100644 --- a/tickets.php +++ b/tickets.php @@ -55,14 +55,16 @@ if (isset($_GET['billable']) && ($_GET['billable']) == '1') { $ticket_billable_snippet = ''; } -if (!empty($_GET['category'])) { - $category = intval($_GET['category']); - $category_snippet = "AND ticket_category = $category"; +// Category Filter +if (isset($_GET['category']) & !empty($_GET['category'])) { + $category_query = 'AND (ticket_category = ' . intval($_GET['category']) . ')'; + $category_filter = intval($_GET['category']); } else { - $category_snippet = ''; + // Default - any + $category_query = ''; + $category_filter = ''; } - // Ticket assignment status filter // Default - any $ticket_assigned_query = ''; @@ -96,7 +98,7 @@ $sql = mysqli_query( LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN categories ON ticket_category = category_id WHERE $ticket_status_snippet " . $ticket_assigned_query . " - $category_snippet + $category_query AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status_name LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR asset_name LIKE '%$q%' OR vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%q%') $ticket_billable_snippet @@ -139,7 +141,7 @@ $sql_total_tickets_assigned = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS $row = mysqli_fetch_array($sql_total_tickets_assigned); $user_active_assigned_tickets = intval($row['total_tickets_assigned']); -$sql_categories = mysqli_query( +$sql_categories_filter = mysqli_query( $mysqli, "SELECT * FROM categories WHERE category_type = 'Ticket' @@ -188,7 +190,7 @@ $sql_categories = mysqli_query(
    -
    +
    @@ -197,7 +199,32 @@ $sql_categories = mysqli_query(
    -
    +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    -
    - -
    - All -
    - - -
    - - No Category -
    -
    List -
    - Compact List
    Kanban @@ -422,8 +420,6 @@ $sql_categories_filter = mysqli_query( if (isset($_GET["view"])) { if ($_GET["view"] == "list") { require_once "tickets_list.php"; - } elseif ($_GET["view"] == "compact") { - require_once "tickets_compact.php"; } elseif ($_GET["view"] == "kanban") { require_once "tickets_kanban.php"; } @@ -431,8 +427,6 @@ if (isset($_GET["view"])) { // here we have to get default view setting if ($config_ticket_default_view === 0) { require_once "tickets_list.php"; - } elseif ($config_ticket_default_view === 1) { - require_once "tickets_compact.php"; } elseif ($config_ticket_default_view === 2) { require_once "tickets_kanban.php"; } else { diff --git a/tickets_compact.php b/tickets_compact.php deleted file mode 100644 index abceed1b..00000000 --- a/tickets_compact.php +++ /dev/null @@ -1,294 +0,0 @@ -
    -
    -
    - - -
    - - "> - - - - - - - - - - - - = 2) { ?> - - - - - - - - - - Never

    "; - } else { - $ticket_updated_at_display = "

    Never

    "; - } - } else { - $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; - } - - $project_id = intval($row['ticket_project_id']); - - $client_id = intval($row['ticket_client_id']); - $client_name = nullable_htmlentities($row['client_name']); - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_email = nullable_htmlentities($row['contact_email']); - $asset_name = nullable_htmlentities($row['asset_name']); - - if ($ticket_priority == "High") { - $ticket_priority_color = "danger"; - } elseif ($ticket_priority == "Medium") { - $ticket_priority_color = "warning"; - } else { - $ticket_priority_color = "info"; - } - - $ticket_assigned_to = intval($row['ticket_assigned_to']); - if (empty($ticket_assigned_to)) { - if (!empty($ticket_closed_at)) { - $ticket_assigned_to_display = "

    Not Assigned

    "; - } else { - $ticket_assigned_to_display = "

    Not Assigned

    "; - } - } else { - $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); - } - - if (empty($contact_name)) { - $contact_display = "-"; - } else { - $contact_display = ""; - } - - // Get who last updated the ticket - to be shown in the last Response column - - // Defaults to prevent undefined errors - $ticket_reply_created_at = ""; - $ticket_reply_created_at_time_ago = "Never"; - $ticket_reply_by_display = ""; - $ticket_reply_type = "Client"; // Default to client for un-replied tickets - - $sql_ticket_reply = mysqli_query($mysqli, - "SELECT ticket_reply_type, ticket_reply_created_at, contact_name, user_name FROM ticket_replies - LEFT JOIN users ON ticket_reply_by = user_id - LEFT JOIN contacts ON ticket_reply_by = contact_id - WHERE ticket_reply_ticket_id = $ticket_id - AND ticket_reply_archived_at IS NULL - ORDER BY ticket_reply_id DESC LIMIT 1" - ); - $row = mysqli_fetch_array($sql_ticket_reply); - - if ($row) { - $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); - if ($ticket_reply_type == "Client") { - $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); - } else { - $ticket_reply_by_display = nullable_htmlentities($row['user_name']); - } - $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); - $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); - } - - - // Get Tasks - $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_created_at ASC"); - $task_count = mysqli_num_rows($sql_tasks); - // Get Completed Task Count - $sql_tasks_completed = mysqli_query($mysqli, - "SELECT * FROM tasks - WHERE task_ticket_id = $ticket_id - AND task_completed_at IS NOT NULL" - ); - $completed_task_count = mysqli_num_rows($sql_tasks_completed); - - // Tasks Completed Percent - if($task_count) { - $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); - } - - ?> - - "> - - - - - - - - - - - = 2) { ?> - - - - - - - - - - - - - - -
    - -
    - -
    - -     		- - Ticket - - - - Client - - - - Contact - - - - Billable - - - - Status - - - - Assigned - -
    - - -
    - -
    - -     		-
    - - data-toggle = "ajax-modal" - data-ajax-url = "ajax/ajax_ticket_priority.php" - data-ajax-id = "" - - > - - - - - - - - - -
    - - - $ticket_subject"; - } else { - echo $ticket_subject; - } ?> - - - 0) { ?> -
    -
    - -
    -
    - - -
    -

    - -

    -
    - -     		- - - -
    -     		- - Yes"; - } else { - echo "No"; - } - ?> - - - - $ticket_scheduled_for "; } ?> - - = 2 && empty($ticket_closed_at)) { ?> - data-toggle = "ajax-modal" - data-ajax-url = "ajax/ajax_ticket_assign.php" - data-ajax-id = "" - - > - - -
    -
    - - - - - - - -
    - -
    -
    \ No newline at end of file diff --git a/tickets_list.php b/tickets_list.php index ceb29df0..756b5d18 100644 --- a/tickets_list.php +++ b/tickets_list.php @@ -4,7 +4,7 @@
    - +
    text-nowrap"> From da3a1d2ce4c165d2cc6140ee89ec76cee6f82259 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 14 Jul 2025 15:13:36 +0100 Subject: [PATCH 064/244] Allow linking closed tickets to a project --- modals/project_link_closed_ticket_modal.php | 42 +++++++++++++++++++++ post/user/project.php | 35 +++++++++++++++++ project_details.php | 5 +++ 3 files changed, 82 insertions(+) create mode 100644 modals/project_link_closed_ticket_modal.php diff --git a/modals/project_link_closed_ticket_modal.php b/modals/project_link_closed_ticket_modal.php new file mode 100644 index 00000000..be93b6ab --- /dev/null +++ b/modals/project_link_closed_ticket_modal.php @@ -0,0 +1,42 @@ + diff --git a/post/user/project.php b/post/user/project.php index 39e5d618..bf02acde 100644 --- a/post/user/project.php +++ b/post/user/project.php @@ -234,3 +234,38 @@ if (isset($_POST['link_ticket_to_project'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } + +if (isset($_POST['link_closed_ticket_to_project'])) { + + enforceUserPermission('module_support', 2); + $project_id = intval($_POST['project_id']); + $ticket_number = intval($_POST['ticket_number']); + + // Get Project Name and Client ID for logging + $sql = mysqli_query($mysqli, "SELECT project_client_id, project_name FROM projects WHERE project_id = $project_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['project_client_id']); + $project_name = sanitizeInput($row['project_name']); + + // Get ticket details + $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_updated_at FROM tickets WHERE ticket_number = $ticket_number"); + if (mysqli_num_rows($sql) == 0) { + $_SESSION['alert_message'] = "Cannot merge into that ticket."; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + $row = mysqli_fetch_array($sql); + $ticket_id = intval($row['ticket_id']); + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $ticket_updated = sanitizeInput($row['ticket_updated_at']); // So we don't mess with the last response + + mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id, ticket_updated_at = '$ticket_updated' WHERE ticket_id = $ticket_id"); + + // Logging + logAction("Project", "Edit", "$session_name added ticket $ticket_prefix$ticket_number - $ticket_subject to project $project_name", $client_id, $project_id); + + $_SESSION['alert_message'] = "Ticket added to $project_name"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/project_details.php b/project_details.php index ca303319..ba893ef7 100644 --- a/project_details.php +++ b/project_details.php @@ -235,6 +235,10 @@ if (isset($_GET['project_id'])) { Open Ticket +
    + + Closed Ticket + @@ -552,6 +556,7 @@ if (isset($_GET['project_id'])) { Date: Mon, 14 Jul 2025 17:36:03 -0400 Subject: [PATCH 065/244] Converted add payment to a dropdown under invoice to allow for the standard manaual add payment and to pay with a saved card or by entering a card manully --- ajax/ajax_invoice_pay.php | 2 +- includes/inc_xcustom.php | 13 +++++++++++++ invoice.php | 38 +++++++++++++++++++++++++++++++------- tickets.php | 12 ++++++------ 4 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 includes/inc_xcustom.php diff --git a/ajax/ajax_invoice_pay.php b/ajax/ajax_invoice_pay.php index e4e4563b..eb9c5213 100644 --- a/ajax/ajax_invoice_pay.php +++ b/ajax/ajax_invoice_pay.php @@ -132,7 +132,7 @@ ob_start(); diff --git a/includes/inc_xcustom.php b/includes/inc_xcustom.php new file mode 100644 index 00000000..9a627ebd --- /dev/null +++ b/includes/inc_xcustom.php @@ -0,0 +1,13 @@ + - - Add Payment - + +
    + + +
    + ">Enter Card Manually + 0) { ?> +
    Pay with a Saved Card
    + + + + +
    +
    + Pay via Payment Provider diff --git a/tickets.php b/tickets.php index 3826dcd5..8e4b394d 100644 --- a/tickets.php +++ b/tickets.php @@ -199,12 +199,12 @@ $sql_categories_filter = mysqli_query( -
    +
    -
    +
    - +
    -
    +
    -
    +
    - - - -
    -
    -
    - -
    - - -
    +
    +
    + + + + +
    +
    +
    + +
    + +
    -
    - -
    -
    - 0) { ?> - +
    +
    +
    + "> + Archived + + - -
    -
    -
    " id="advancedFilter"> -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - + + Set Category +
    - -
    +
    +
    " id="advancedFilter"> +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    text-nowrap"> + +
    +
    + +
    +     		Number @@ -318,6 +338,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
    +
    + +
    +     		@@ -402,10 +427,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - -
    + + +
    +
    + + +
    +
    +
    +
    Bulk Set Category
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    +
    +
    diff --git a/post/user/invoice.php b/post/user/invoice.php index 4cad3f3f..827d346f 100644 --- a/post/user/invoice.php +++ b/post/user/invoice.php @@ -2082,4 +2082,46 @@ if (isset($_GET['export_invoice_pdf'])) { $pdf->Output("$filename.pdf", 'I'); exit; +} + +if (isset($_POST['bulk_edit_invoice_category'])) { + + $category_id = intval($_POST['bulk_category_id']); + + // Get Category name for logging and Notification + $sql = mysqli_query($mysqli,"SELECT category_name FROM categories WHERE category_id = $category_id"); + $row = mysqli_fetch_array($sql); + $category_name = sanitizeInput($row['category_name']); + + // Assign Income category to Selected Invoices + if (isset($_POST['invoice_ids'])) { + + // Get Selected Count + $count = count($_POST['invoice_ids']); + + foreach($_POST['invoice_ids'] as $invoice_id) { + $invoice_id = intval($invoice_id); + + // Get Invoice Details for Logging + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_scope = sanitizeInput($row['invoice_scope']); + $client_id = intval($row['invoice_client_id']); + + mysqli_query($mysqli,"UPDATE invoices SET invoice_category_id = $category_id WHERE invoice_id = $invoice_id"); + + // Logging + logAction("Invoice", "Edit", "$session_name assigned Invoice $invoice_prefix$invoice_number to category $category_name", $client_id, $invoice_id); + + } // End Assign Loop + + // Logging + logAction("Invoice", "Bulk Edit", "$session_name assigned $count invoices to category $category_name"); + + $_SESSION['alert_message'] = "Assigned income category $category_name to $count invoice(s)"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); } \ No newline at end of file From 896da66caf3c915ea7992fefa6170e0f63f58b1d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 15 Jul 2025 13:26:13 -0400 Subject: [PATCH 067/244] Remove the Archive button from invoices as we dont archive invoices --- invoices.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/invoices.php b/invoices.php index c7d77c03..0b514f19 100644 --- a/invoices.php +++ b/invoices.php @@ -182,10 +182,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> - Archived - -
    +
    +
    + +
    +
    +
    + + + + +
    +
    Editing:
    + +
    +
    + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + +Saved Payments

    +
  • + + +

    AI Providers

    +     +
    • +
  • + + +

    AI Models

    +     +
  • diff --git a/modals/admin_ai_model_add_modal.php b/modals/admin_ai_model_add_modal.php index ea8b8e9a..ec1f8489 100644 --- a/modals/admin_ai_model_add_modal.php +++ b/modals/admin_ai_model_add_modal.php @@ -3,17 +3,37 @@
    -
    New AI Provider
    +
    Add AI Model
    -
    +
    + +
    +
    + +
    + +
    +
    +
    @@ -31,6 +51,7 @@
    @@ -38,13 +59,7 @@
    - -
    -
    - -
    - -
    +
    diff --git a/modals/admin_ai_provider_add_modal.php b/modals/admin_ai_provider_add_modal.php index 5ad9d46c..7e478073 100644 --- a/modals/admin_ai_provider_add_modal.php +++ b/modals/admin_ai_provider_add_modal.php @@ -43,21 +43,6 @@
    -
    - -
    - -
    -
    - -
    - -
    - - More AI models can be added after adding the provider. - -
    -
    • diff --git a/post/admin/admin_ai.php b/post/admin/admin_ai.php deleted file mode 100644 index a78ab900..00000000 --- a/post/admin/admin_ai.php +++ /dev/null @@ -1,137 +0,0 @@ -$provider created"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['edit_ai_provider'])) { - - validateCSRFToken($_GET['csrf_token']); - - $provider_id intval($_POST['provider_id']) - $provider = sanitizeInput($_POST['provider']); - $url = sanitizeInput($_POST['url']); - $api_key = sanitizeInput($_POST['api_key']); - - mysqli_query($mysqli,"UPDATE ai_providers SET ai_provider_name = '$name', ai_provider_url = '$url', ai_provider_api_key = '$api_key' WHERE ai_provider_id = $provider_id"); - - // Logging - logAction("AI Provider", "Edit", "$session_name edited AI Provider $provider"); - - $_SESSION['alert_message'] = "AI Model $provider edited"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['delete_ai_provider'])) { - - $provider_id = intval($_GET['delete_ai_provider']); - - $sql = mysqli_query($mysqli,"SELECT ai_provider_name FROM ai_providers WHERE ai_provider_id = $provider_id"); - $row = mysqli_fetch_array($sql); - $provider_name = sanitizeInput($row['ai_provider_name']); - - mysqli_query($mysqli,"DELETE FROM ai_providers WHERE ai_provider_id = $provider_id"); - - // Logging - logAction("AI Provider", "Delete", "$session_name deleted AI Provider $provider_name"); - - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "AI Provider $provider_name deleted"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['add_ai_model'])) { - - validateCSRFToken($_GET['csrf_token']); - - $provider_id = intval($_POST['provider_id']); - $model = sanitizeInput($_POST['model']); - $prompt = sanitizeInput($_POST['prompt']); - $use_case = sanitizeInput($_POST['use_case']); - - mysqli_query($mysqli,"INSERT INTO ai_models SET ai_model_name = '$model', ai_model_prompt = '$prompt', ai_model_use_case = '$use_case', ai_model_ai_provider_id = $provider_id"); - - $ai_model_id = mysqli_insert_id($mysqli); - - // Logging - logAction("AI Model", "Create", "$session_name created AI Model $model"); - - $_SESSION['alert_message'] = "AI Model $model created"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['edit_ai_model'])) { - - validateCSRFToken($_GET['csrf_token']); - - $model_id = intval($_POST['model_id']); - $model = sanitizeInput($_POST['model']); - $prompt = sanitizeInput($_POST['prompt']); - $use_case = sanitizeInput($_POST['use_case']); - - mysqli_query($mysqli,"UPDATE ai_models SET ai_model_name = '$model', ai_model_prompt = '$prompt', ai_model_use_case = '$use_case' WHERE ai_model_id = $model_id"); - - // Logging - logAction("AI Model", "Edit", "$session_name edited AI Model $model"); - - $_SESSION['alert_message'] = "AI Model $model edited"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['delete_ai_model'])) { - - $model_id = intval($_GET['delete_ai_model']); - - $sql = mysqli_query($mysqli,"SELECT ai_model_name FROM ai_models WHERE ai_model_id = $model_id"); - $row = mysqli_fetch_array($sql); - $model_name = sanitizeInput($row['ai_model_name']); - - mysqli_query($mysqli,"DELETE FROM ai_models WHERE ai_model_id = $model_id"); - - // Logging - logAction("AI Model", "Delete", "$session_name deleted AI Model $model_name"); - - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "AI Model $model_name deleted"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - diff --git a/post/admin/admin_ai_model.php b/post/admin/admin_ai_model.php new file mode 100644 index 00000000..e2237a0b --- /dev/null +++ b/post/admin/admin_ai_model.php @@ -0,0 +1,71 @@ +$model created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_ai_model'])) { + + validateCSRFToken($_POST['csrf_token']); + + $model_id = intval($_POST['model_id']); + $model = sanitizeInput($_POST['model']); + $prompt = sanitizeInput($_POST['prompt']); + $use_case = sanitizeInput($_POST['use_case']); + + mysqli_query($mysqli,"UPDATE ai_models SET ai_model_name = '$model', ai_model_prompt = '$prompt', ai_model_use_case = '$use_case' WHERE ai_model_id = $model_id"); + + // Logging + logAction("AI Model", "Edit", "$session_name edited AI Model $model"); + + $_SESSION['alert_message'] = "AI Model $model edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_ai_model'])) { + + validateCSRFToken($_GET['csrf_token']); + + $model_id = intval($_GET['delete_ai_model']); + + $sql = mysqli_query($mysqli,"SELECT ai_model_name FROM ai_models WHERE ai_model_id = $model_id"); + $row = mysqli_fetch_array($sql); + $model_name = sanitizeInput($row['ai_model_name']); + + mysqli_query($mysqli,"DELETE FROM ai_models WHERE ai_model_id = $model_id"); + + // Logging + logAction("AI Model", "Delete", "$session_name deleted AI Model $model_name"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "AI Model $model_name deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/admin/admin_ai_provider.php b/post/admin/admin_ai_provider.php new file mode 100644 index 00000000..b10d730a --- /dev/null +++ b/post/admin/admin_ai_provider.php @@ -0,0 +1,72 @@ +$provider created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_ai_provider'])) { + + validateCSRFToken($_POST['csrf_token']); + + $provider_id = intval($_POST['provider_id']); + $provider = sanitizeInput($_POST['provider']); + $url = sanitizeInput($_POST['url']); + $api_key = sanitizeInput($_POST['api_key']); + + mysqli_query($mysqli,"UPDATE ai_providers SET ai_provider_name = '$provider', ai_provider_api_url = '$url', ai_provider_api_key = '$api_key' WHERE ai_provider_id = $provider_id"); + + // Logging + logAction("AI Provider", "Edit", "$session_name edited AI Provider $provider"); + + $_SESSION['alert_message'] = "AI Model $provider edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_ai_provider'])) { + + validateCSRFToken($_GET['csrf_token']); + + $provider_id = intval($_GET['delete_ai_provider']); + + $sql = mysqli_query($mysqli,"SELECT ai_provider_name FROM ai_providers WHERE ai_provider_id = $provider_id"); + $row = mysqli_fetch_array($sql); + $provider_name = sanitizeInput($row['ai_provider_name']); + + mysqli_query($mysqli,"DELETE FROM ai_providers WHERE ai_provider_id = $provider_id"); + + // Logging + logAction("AI Provider", "Delete", "$session_name deleted AI Provider $provider_name"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "AI Provider $provider_name deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/ai.php b/post/ai.php index 74e4aedc..a2db416e 100644 --- a/post/ai.php +++ b/post/ai.php @@ -10,17 +10,23 @@ if (isset($_GET['ai_reword'])) { header('Content-Type: application/json'); + $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); + + $row = mysqli_fetch_array($sql); + $model_name = $row['ai_model_name']; + $promptText = $row['ai_model_prompt']; + $url = $row['ai_provider_api_url']; + $key = $row['ai_provider_api_key']; + // Collecting the input data from the AJAX request. $inputJSON = file_get_contents('php://input'); $input = json_decode($inputJSON, TRUE); // Convert JSON into array. - $promptText = "Rephrase this ticket response to be clear, professional, and polite. Maintain the original meaning without adding or omitting information. Do not invent details. Keep the tone neutral and professional. Avoid technical jargon unless necessary. Please return only the reworded text as clean, properly formatted HTML, without any code block markers, backticks, or the word 'html'. Do not include any other commentary or explanations."; - $userText = $input['text']; // Preparing the data for the OpenAI Chat API request. $data = [ - "model" => "$config_ai_model", // Specify the model + "model" => "$model_name", // Specify the model "messages" => [ ["role" => "system", "content" => $promptText], ["role" => "user", "content" => $userText], @@ -29,7 +35,7 @@ if (isset($_GET['ai_reword'])) { ]; // Initialize cURL session to the OpenAI Chat API. - $ch = curl_init("$config_ai_url"); + $ch = curl_init("$url"); // Set cURL options for the request. curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -37,7 +43,7 @@ if (isset($_GET['ai_reword'])) { curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data)); curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: application/json', - 'Authorization: Bearer ' . $config_ai_api_key, + 'Authorization: Bearer ' . $key, ]); // Execute the cURL session and capture the response. @@ -72,6 +78,13 @@ if (isset($_GET['ai_reword'])) { if (isset($_GET['ai_ticket_summary'])) { + $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); + + $row = mysqli_fetch_array($sql); + $model_name = $row['ai_model_name']; + $url = $row['ai_provider_api_url']; + $key = $row['ai_provider_api_key']; + // Retrieve the ticket_id from POST $ticket_id = intval($_POST['ticket_id']); @@ -108,7 +121,7 @@ if (isset($_GET['ai_ticket_summary'])) { // Prepare the POST data $post_data = [ - "model" => "$config_ai_model", + "model" => "$model_name", "messages" => [ ["role" => "system", "content" => "You are a helpful assistant."], ["role" => "user", "content" => $prompt] @@ -117,12 +130,12 @@ if (isset($_GET['ai_ticket_summary'])) { ]; $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $config_ai_url); + curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: application/json', - 'Authorization: Bearer ' . $config_ai_api_key + 'Authorization: Bearer ' . $key ]); curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($post_data)); @@ -145,6 +158,13 @@ if (isset($_GET['ai_create_document_template'])) { header('Content-Type: text/html; charset=UTF-8'); + $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); + + $row = mysqli_fetch_array($sql); + $model_name = $row['ai_model_name']; + $url = $row['ai_provider_api_url']; + $key = $row['ai_provider_api_key']; + $prompt = $_POST['prompt'] ?? ''; // Basic validation @@ -158,7 +178,7 @@ if (isset($_GET['ai_create_document_template'])) { $user_message = "Create an HTML formatted IT documentation template based on the following request:\n\n\"$prompt\"\n\nThe template should be structured, professional, and useful for IT staff. Include relevant sections, instructions, prerequisites, and best practices."; $post_data = [ - "model" => "$config_ai_model", + "model" => "$model_name", "messages" => [ ["role" => "system", "content" => $system_message], ["role" => "user", "content" => $user_message] @@ -167,12 +187,12 @@ if (isset($_GET['ai_create_document_template'])) { ]; $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $config_ai_url); + curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: application/json', - 'Authorization: Bearer ' . $config_ai_api_key + 'Authorization: Bearer ' . $key ]); curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($post_data)); From 3e7d7f38019e4f9305e733bdef2e35ca22651160 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 15 Jul 2025 18:23:20 -0400 Subject: [PATCH 072/244] Make Client Portal Dashboard Cards Linkable, added upaid invoices with ui for option to enter card manually, pay with saved card or pay entire balance --- client/index.php | 22 ++--- client/invoices.php | 1 - client/unpaid_invoices.php | 170 +++++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 12 deletions(-) create mode 100644 client/unpaid_invoices.php diff --git a/client/index.php b/client/index.php index 7706dc1f..7556c1bf 100644 --- a/client/index.php +++ b/client/index.php @@ -180,28 +180,28 @@ if ($session_contact_primary == 1 || $session_contact_is_billing_contact) { ?>
    0) { ?> -
    -
    +
    +
    -

    Account Balance

    +

    Account Balance

    -
    +
    0) { ?>
    -
    +

    Recurring Monthly

    -
    +
    @@ -217,8 +217,8 @@ if ($session_contact_primary == 1 || $session_contact_is_technical_contact) {
    0) { ?> -
    -
    +
    +

    Domains Expiring

    @@ -240,7 +240,7 @@ if ($session_contact_primary == 1 || $session_contact_is_technical_contact) { -
    +
    @@ -255,7 +255,7 @@ if ($session_contact_primary == 1 || $session_contact_is_technical_contact) {
    0) { ?>
    -
    +

    Your Assigned Assets

    @@ -277,7 +277,7 @@ if ($session_contact_primary == 1 || $session_contact_is_technical_contact) { ?>
    -
    +
    diff --git a/client/invoices.php b/client/invoices.php index 654a4bd3..eb2070d4 100644 --- a/client/invoices.php +++ b/client/invoices.php @@ -86,7 +86,6 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie - diff --git a/client/unpaid_invoices.php b/client/unpaid_invoices.php new file mode 100644 index 00000000..0008b4c8 --- /dev/null +++ b/client/unpaid_invoices.php @@ -0,0 +1,170 @@ + + +
    +
    +

    Unpaid Invoices

    +
    +
    + + +
    + ">Enter Card Manually + 0) { ?> +
    Pay with a Saved Card
    + + + + +
    + +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #ScopeAmountDateDue
    "> + + +
    + ">Enter Card Manually + 0) { ?> +
    Pay with a Saved Card
    + + + + +
    + +
    + +
    + +
    + + + Date: Tue, 15 Jul 2025 18:27:09 -0400 Subject: [PATCH 073/244] Add Credit card icon to the pay button --- client/unpaid_invoices.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/unpaid_invoices.php b/client/unpaid_invoices.php index 0008b4c8..844f3175 100644 --- a/client/unpaid_invoices.php +++ b/client/unpaid_invoices.php @@ -49,7 +49,7 @@ $balance = $invoice_amounts - $amount_paid;
    - +
    ">Enter Card Manually "> - +
    ">Enter Card Manually Date: Mon, 21 Jul 2025 08:11:57 +0100 Subject: [PATCH 074/244] Add default purchase date for csv import to prevent error when undefined --- post/user/asset.php | 1 + 1 file changed, 1 insertion(+) diff --git a/post/user/asset.php b/post/user/asset.php index beb4f5f6..78812f97 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -860,6 +860,7 @@ if (isset($_POST["import_assets_csv"])) { // Default variables (if undefined) $description = $type = $make = $model = $serial = $os = ''; $contact_id = $location_id = 0; + $purchase_date = '0000-00-00'; $duplicate_detect = 0; From dfe0a0b1c78646a312d0f975f72d00eed74e90f3 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 21 Jul 2025 09:18:30 +0100 Subject: [PATCH 075/244] Add default netid for asset int csv import to prevent errors --- post/user/asset.php | 1 + 1 file changed, 1 insertion(+) diff --git a/post/user/asset.php b/post/user/asset.php index 78812f97..f34b0a27 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -1514,6 +1514,7 @@ if (isset($_POST["import_client_asset_interfaces_csv"])) { // Default variables (if undefined) $description = $type = $mac = $ip = $nat_ip = $ipv6 = $network = ''; + $network_id = 0; $duplicate_detect = 0; if (isset($column[0])) { From 50a8e6791752f9b2fcc6e2490c05962d76a112d1 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 21 Jul 2025 13:29:29 -0400 Subject: [PATCH 076/244] Commented out deleting old Payment Provider Settings from DB until next release --- database_updates.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/database_updates.php b/database_updates.php index c8bfe440..e2d800c4 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3768,6 +3768,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.3') { // Delete all Recurring Payments that are Stripe @@ -3795,7 +3796,8 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); } - + /* + // if (CURRENT_DATABASE_VERSION == '2.2.4') { // // Insert queries here required to update to DB version 2.2.5 // // Then, update the database to the next sequential version From b100498dd7974391f2f36506a40e983311190609 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 21 Jul 2025 18:27:31 -0400 Subject: [PATCH 077/244] Add Client Bulk Actions: Edit Tags, Referral, Industry, Set Hourly Rate, Send Bulk Email, Archive. Also added restore option to restore a client --- clients.php | 505 ++++++++++-------- modals/client_bulk_assign_tags_modal.php | 48 ++ modals/client_bulk_edit_hourly_rate_modal.php | 31 ++ modals/client_bulk_edit_industry_modal.php | 31 ++ modals/client_bulk_edit_referral_modal.php | 49 ++ modals/client_bulk_email_modal.php | 100 ++++ post/user/client.php | 320 ++++++++++- post/user/contact.php | 6 +- 8 files changed, 863 insertions(+), 227 deletions(-) create mode 100644 modals/client_bulk_assign_tags_modal.php create mode 100644 modals/client_bulk_edit_hourly_rate_modal.php create mode 100644 modals/client_bulk_edit_industry_modal.php create mode 100644 modals/client_bulk_edit_referral_modal.php create mode 100644 modals/client_bulk_email_modal.php diff --git a/clients.php b/clients.php index ebaf6a3a..c294cb55 100644 --- a/clients.php +++ b/clients.php @@ -131,6 +131,45 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); class="btn btn-"> Archived +
    @@ -246,251 +285,277 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    - - text-nowrap"> - - - - - = 1) && $config_module_enable_accounting == 1) { ?> - = 2) { ?> - - - - $location_address
    $location_city $location_state $location_zip
    $location_country"; - } - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); - $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - $contact_email = nullable_htmlentities($row['contact_email']); - $client_website = nullable_htmlentities($row['client_website']); - $client_rate = floatval($row['client_rate']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); - $client_updated_at = nullable_htmlentities($row['client_updated_at']); - $client_archived_at = nullable_htmlentities($row['client_archived_at']); - $client_is_lead = intval($row['client_lead']); - - // Abbreviation - if (empty($client_abbreviation)) { - $client_abbreviation = shortenClient($client_name); - } - - // Client Tags - - $client_tag_name_display_array = array(); - $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($client_tag_icon)) { - $client_tag_icon = "tag"; - } - - $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name"; - } - $client_tags_display = implode('', $client_tag_name_display_array); - - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' "); - $row = mysqli_fetch_array($sql_invoice_amounts); - - $invoice_amounts = floatval($row['invoice_amounts']); - - $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_amount_paid); - - $amount_paid = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - //set Text color on balance - if ($balance > 0) { - $balance_text_color = "text-danger font-weight-bold"; - } else { - $balance_text_color = ""; - } - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - ?> + + +
    +
    - - Client Name - - - - Primary Location - - - - Primary Contact - - - Billing Action
    + text-nowrap"> - - - + + = 1) && $config_module_enable_accounting == 1) { ?> + = 2) { ?> + + + + $location_address
    $location_city $location_state $location_zip
    $location_country"; + } + $contact_id = intval($row['contact_id']); + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_title = nullable_htmlentities($row['contact_title']); + $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); + $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); + $contact_extension = nullable_htmlentities($row['contact_extension']); + $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); + $contact_email = nullable_htmlentities($row['contact_email']); + $client_website = nullable_htmlentities($row['client_website']); + $client_rate = floatval($row['client_rate']); + $client_currency_code = nullable_htmlentities($row['client_currency_code']); + $client_net_terms = intval($row['client_net_terms']); + $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); + $client_referral = nullable_htmlentities($row['client_referral']); + $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); + $client_notes = nullable_htmlentities($row['client_notes']); + $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); + $client_updated_at = nullable_htmlentities($row['client_updated_at']); + $client_archived_at = nullable_htmlentities($row['client_archived_at']); + $client_is_lead = intval($row['client_lead']); + + // Abbreviation + if (empty($client_abbreviation)) { + $client_abbreviation = shortenClient($client_name); + } + + // Client Tags + + $client_tag_name_display_array = array(); + $client_tag_id_array = array(); + $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_client_tags)) { + + $client_tag_id = intval($row['tag_id']); + $client_tag_name = nullable_htmlentities($row['tag_name']); + $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } + $client_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($client_tag_icon)) { + $client_tag_icon = "tag"; } - if (!empty($contact_name)) { ?> -
    - - -
    - $client_tag_name"; + } + $client_tags_display = implode('', $client_tag_name_display_array); - if (!empty($contact_phone)) { ?> -
    - -
    - -
    - -
    - -
    - -
    - - + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_amount_paid); - - = 1) && $config_module_enable_accounting == 1) { ?> - + - - - - = 2) { ?> + + + + + = 1) && $config_module_enable_accounting == 1) { ?> + + + + + = 2) { ?> + - - + + + - + - -
    - - - -
    - -
    - - -
    - -
    - -
    - Abbreviation:
    - Created:
    +
    		+
    +
    -     		- + + Client Name + + + + + Primary Location + + + + Primary Contact + + + Billing Action
    -
    - Balance -
    -
    - Paid -
    -
    - Monthly -
    -
    - Hourly Rate + $amount_paid = floatval($row['amount_paid']); + + $balance = $invoice_amounts - $amount_paid; + //set Text color on balance + if ($balance > 0) { + $balance_text_color = "text-danger font-weight-bold"; + } else { + $balance_text_color = ""; + } + + //Get Monthly Recurring Total + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_monthly_total); + + $recurring_monthly_total = floatval($row['recurring_monthly_total']); + + //Get Yearly Recurring Total + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_yearly_total); + + $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; + + $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + + ?> +
    +
    +
    		-
    - -
    - - Edit - + - + +
    + +
    + + +
    + +
    + +
    + Abbreviation:
    + Created:
    +
    + +
    		+ +
    + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +     		+
    + Balance +
    +
    + Paid +
    +
    + Monthly +
    +
    + Hourly Rate +
    +     		+
    + +
    + + Edit + + + +
    + + Restore + +
    Archive - - + +
    - -
    -
    + + +
    + +
    + + +
    +
    +
    +
    Bulk Assign Tags
    + +
    + +
    + + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    +
    +
    \ No newline at end of file diff --git a/modals/client_bulk_edit_hourly_rate_modal.php b/modals/client_bulk_edit_hourly_rate_modal.php new file mode 100644 index 00000000..fd8bf169 --- /dev/null +++ b/modals/client_bulk_edit_hourly_rate_modal.php @@ -0,0 +1,31 @@ + diff --git a/modals/client_bulk_edit_industry_modal.php b/modals/client_bulk_edit_industry_modal.php new file mode 100644 index 00000000..cbfa8b1b --- /dev/null +++ b/modals/client_bulk_edit_industry_modal.php @@ -0,0 +1,31 @@ + diff --git a/modals/client_bulk_edit_referral_modal.php b/modals/client_bulk_edit_referral_modal.php new file mode 100644 index 00000000..9417ae4b --- /dev/null +++ b/modals/client_bulk_edit_referral_modal.php @@ -0,0 +1,49 @@ + diff --git a/modals/client_bulk_email_modal.php b/modals/client_bulk_email_modal.php new file mode 100644 index 00000000..fc61ce54 --- /dev/null +++ b/modals/client_bulk_email_modal.php @@ -0,0 +1,100 @@ + \ No newline at end of file diff --git a/post/user/client.php b/post/user/client.php index 8ff8812d..c2ff552d 100644 --- a/post/user/client.php +++ b/post/user/client.php @@ -184,11 +184,12 @@ if (isset($_GET['archive_client'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_GET['undo_archive_client'])) { +if (isset($_GET['restore_client'])) { + validateCSRFToken($_GET['csrf_token']); enforceUserPermission('module_client', 2); - $client_id = intval($_GET['undo_archive_client']); + $client_id = intval($_GET['restore_client']); // Get Client Name $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $client_id"); @@ -198,9 +199,9 @@ if (isset($_GET['undo_archive_client'])) { mysqli_query($mysqli, "UPDATE clients SET client_archived_at = NULL WHERE client_id = $client_id"); // Logging - logAction("Client", "Unarchive", "$session_name unarchived client $client_name", $client_id, $client_id); + logAction("Client", "Restored", "$session_name restored client $client_name", $client_id); - $_SESSION['alert_message'] = "Client $client_name unarchived"; + $_SESSION['alert_message'] = "Client $client_name restored"; header("Location: " . $_SERVER["HTTP_REFERER"]); } @@ -589,6 +590,317 @@ if (isset($_GET['download_clients_csv_template'])) { } +if (isset($_POST['bulk_edit_client_industry'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + $industry = sanitizeInput($_POST['bulk_industry']); + + if (isset($_POST['client_ids'])) { + + $count = count($_POST['client_ids']); + + foreach($_POST['client_ids'] as $client_id) { + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + mysqli_query($mysqli,"UPDATE clients SET client_type = '$industry' WHERE client_id = $client_id"); + + //Logging + logAction("Client", "Edit", "$session_name set Industry to $industry for $client_name", $client_id); + + } + + // Bulk Log + logAction("Client", "Bulk Edit", "$session_name set the department $industry for $count client(s)", $client_id); + + $_SESSION['alert_message'] = "Set the Industry to $industry for $count clients"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['bulk_edit_client_referral'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + $referral = sanitizeInput($_POST['bulk_referral']); + + if (isset($_POST['client_ids'])) { + + $count = count($_POST['client_ids']); + + foreach($_POST['client_ids'] as $client_id) { + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + mysqli_query($mysqli,"UPDATE clients SET client_referral = '$referral' WHERE client_id = $client_id"); + + //Logging + logAction("Client", "Edit", "$session_name set Referral to $referral for $client_name", $client_id); + + } + + // Bulk Log + logAction("Client", "Bulk Edit", "$session_name set the referral $referral for $count client(s)", $client_id); + + $_SESSION['alert_message'] = "Set the Referral to $referral for $count clients"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['bulk_edit_client_hourly_rate'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + $rate = floatval($_POST['bulk_rate']); + + if (isset($_POST['client_ids'])) { + + $count = count($_POST['client_ids']); + + foreach($_POST['client_ids'] as $client_id) { + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + mysqli_query($mysqli,"UPDATE clients SET client_rate = '$rate' WHERE client_id = $client_id"); + + //Logging + logAction("Client", "Edit", "$session_name set Hourly Rate to" . numfmt_format_currency($currency_format, $rate, $session_company_currency) . "for $client_name", $client_id); + + } + + // Bulk Log + logAction("Client", "Bulk Edit", "$session_name set the hourly rate" . numfmt_format_currency($currency_format, $rate, $session_company_currency) . "for $count client(s)", $client_id); + + $_SESSION['alert_message'] = "Set the Hourly Rate to " . numfmt_format_currency($currency_format, $rate, $session_company_currency) . " for $count client(s)"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['bulk_assign_client_tags'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + if (isset($_POST['client_ids'])) { + + $count = count($_POST['client_ids']); + + foreach($_POST['client_ids'] as $client_id) { + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + if ($_POST['bulk_remove_tags']) { + mysqli_query($mysqli, "DELETE FROM client_tags WHERE client_id = $client_id"); + } + + if (isset($_POST['bulk_tags'])) { + foreach($_POST['bulk_tags'] as $tag) { + $tag = intval($tag); + + $sql = mysqli_query($mysqli,"SELECT * FROM client_tags WHERE client_id = $client_id AND tag_id = $tag"); + if (mysqli_num_rows($sql) == 0) { + mysqli_query($mysqli, "INSERT INTO client_tags SET client_id = $client_id, tag_id = $tag"); + } + } + } + + logAction("Client", "Edit", "$session_name added tags to $client_name", $client_id, $client_id); + + } + + logAction("Client", "Bulk Edit", "$session_name added tags for $count clients", $client_id); + + $_SESSION['alert_message'] = "Assigned tags for $count clients"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['bulk_send_client_email']) && isset($_POST['client_ids'])) { + + $client_ids = array_map('intval', $_POST['client_ids']); + $count = count($client_ids); + + // Email metadata + $mail_from = sanitizeInput($_POST['mail_from']); + $mail_from_name = sanitizeInput($_POST['mail_from_name']); + $subject = sanitizeInput($_POST['subject']); + $body = mysqli_real_escape_string($mysqli, $_POST['body']); + $queued_at = sanitizeInput($_POST['queued_at']); + + // Build contact type filters + $filters = []; + + if (!empty($_POST['primary_contacts'])) { + $filters[] = "contact_primary = 1"; + } + if (!empty($_POST['important_contacts'])) { + $filters[] = "contact_important = 1"; + } + if (!empty($_POST['billing_contacts'])) { + $filters[] = "contact_billing = 1"; + } + if (!empty($_POST['technical_contacts'])) { + $filters[] = "contact_technical = 1"; + } + + $contact_filter_query = ''; + if (!empty($filters)) { + $contact_filter_query = ' AND (' . implode(' OR ', $filters) . ')'; + } + + // Prepare client ID list for SQL + $client_ids_str = implode(',', $client_ids); + + // SQL to fetch matching contacts + $sql = "SELECT * FROM contacts + WHERE contact_client_id IN ($client_ids_str) + $contact_filter_query"; + + $result = mysqli_query($mysqli, $sql); + + $data = []; + $unique_contacts = []; + + while ($row = mysqli_fetch_array($result)) { + $contact_email = sanitizeInput($row['contact_email']); + + // Skip if email is missing or invalid + if (empty($contact_email) || !filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { + continue; + } + + // Skip duplicates (same email) + if (isset($unique_contacts[$contact_email])) { + continue; + } + $unique_contacts[$contact_email] = true; + + $contact_name = sanitizeInput($row['contact_name']); + + $data[] = [ + 'from' => $mail_from, + 'from_name' => $mail_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body, + 'queued_at' => $queued_at + ]; + } + + if (!empty($data)) { + addToMailQueue($data); + logAction("Bulk Mail", "Send", "$session_name sent " . count($data) . " messages via bulk mail"); + $_SESSION['alert_message'] = "" . count($data) . " messages queued"; + } else { + $_SESSION['alert_message'] = "No valid contacts found to queue emails."; + } + + // Redirect back + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; +} + +if (isset($_POST['bulk_archive_clients'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + if (isset($_POST['client_ids'])) { + + $count = 0; + + foreach ($_POST['client_ids'] as $client_id) { + + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + mysqli_query($mysqli,"UPDATE clients SET client_archived_at = NOW() WHERE client_id = $client_id"); + + logAction("Client", "Archive", "$session_name archived $client_name", $client_id); + + $count++; + + } + + // Bulk Logging + logAction("Client", "Bulk Archive", "$session_name archived $count clients", $client_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Archived $count client(s)"; + + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['bulk_unarchive_clients'])) { + + enforceUserPermission('module_client', 2); + + validateCSRFToken($_POST['csrf_token']); + + if (isset($_POST['client_ids'])) { + + $count = count($_POST['client_ids']); + + foreach ($_POST['client_ids'] as $client_id) { + + $client_id = intval($client_id); + + $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); + $row = mysqli_fetch_array($sql); + $client_name = sanitizeInput($row['client_name']); + + mysqli_query($mysqli,"UPDATE clients SET client_archived_at = NULL WHERE client_id = $client_id"); + + // Individual Contact logging + logAction("client", "Restore", "$session_name restored $client_name", $client_id); + + } + + // Bulk Logging + logAction("Client", "Bulk Restore", "$session_name restored $count client(s)", $client_id); + + $_SESSION['alert_message'] = "You restored $count client(s)"; + + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST["export_client_pdf"])) { // Enforce permissions diff --git a/post/user/contact.php b/post/user/contact.php index 14975611..5a0c43b7 100644 --- a/post/user/contact.php +++ b/post/user/contact.php @@ -661,14 +661,14 @@ if (isset($_POST['bulk_unarchive_contacts'])) { mysqli_query($mysqli,"UPDATE contacts SET contact_archived_at = NULL WHERE contact_id = $contact_id"); // Individual Contact logging - logAction("Contact", "Unarchive", "$session_name unarchived $contact_name", $client_id, $contact_id); + logAction("Contact", "Restore", "$session_name restored $contact_name", $client_id, $contact_id); } // Bulk Logging - logAction("Contact", "Bulk Unarchive", "$session_name Unarchived $count contacts", $client_id); + logAction("Contact", "Bulk Restore", "$session_name restored $count contacts", $client_id); - $_SESSION['alert_message'] = "You unarchived $count contact(s)"; + $_SESSION['alert_message'] = "Restored $count contact(s)"; } From 4c031c8f83b96fecca9acc45adffbbf187eda78b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 21 Jul 2025 21:31:39 -0400 Subject: [PATCH 078/244] Increase the width for totals on invoices and Quotes PDF Exports --- guest/guest_post.php | 8 ++++---- post/user/invoice.php | 4 ++-- post/user/quote.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/guest/guest_post.php b/guest/guest_post.php index eebd873b..1daebfdd 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -371,8 +371,8 @@ if (isset($_GET['export_quote_pdf'])) { // Totals $html .= ' - - +
    ' . nl2br($quote_note) . ' + ' . nl2br($quote_note) . ' '; if ($quote_discount > 0) { @@ -590,8 +590,8 @@ if (isset($_GET['export_invoice_pdf'])) { // Totals $html .= '
    Subtotal:' . numfmt_format_currency($currency_format, $sub_total, $quote_currency_code) . '
    - - +
    ' . nl2br($invoice_note) . ' + ' . nl2br($invoice_note) . ' '; if ($invoice_discount > 0) { diff --git a/post/user/invoice.php b/post/user/invoice.php index 827d346f..06ac3731 100644 --- a/post/user/invoice.php +++ b/post/user/invoice.php @@ -2051,8 +2051,8 @@ if (isset($_GET['export_invoice_pdf'])) { // Totals $html .= '
    Subtotal:' . numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code) . '
    - - + + + + + 0) { ?> diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php index b7b15ba0..6dd6491b 100644 --- a/modals/client_add_modal.php +++ b/modals/client_add_modal.php @@ -7,32 +7,31 @@ × + + +
    - - -
    -
    @@ -373,7 +372,7 @@
    - +
    diff --git a/modals/client_credit_add_modal.php b/modals/client_credit_add_modal.php new file mode 100644 index 00000000..770ae17f --- /dev/null +++ b/modals/client_credit_add_modal.php @@ -0,0 +1,82 @@ + diff --git a/post/user/credit.php b/post/user/credit.php new file mode 100644 index 00000000..4acdbb97 --- /dev/null +++ b/post/user/credit.php @@ -0,0 +1,29 @@ + $invoice_balance) { + $_SESSION['alert_message'] = "Credit is more than the balance"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + } else { + mysqli_query($mysqli,"UPDATE invoices SET invoice_credit_amount = $amount WHERE invoice_id = $invoice_id"); + + /* + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql_total_payments_amount); + $total_payments_amount = floatval($row['payments_amount']); + + //Get the invoice total + $sql = mysqli_query($mysqli,"SELECT * FROM invoices + LEFT JOIN clients ON invoice_client_id = client_id + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE invoice_id = $invoice_id" + ); + + $row = mysqli_fetch_array($sql); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_url_key = sanitizeInput($row['invoice_url_key']); + $invoice_currency_code = sanitizeInput($row['invoice_currency_code']); + $client_id = intval($row['client_id']); + $client_name = sanitizeInput($row['client_name']); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code'])); + $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']); + $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code'])); + + $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + + $company_name = sanitizeInput($row['company_name']); + $company_country = sanitizeInput($row['company_country']); + $company_address = sanitizeInput($row['company_address']); + $company_city = sanitizeInput($row['company_city']); + $company_state = sanitizeInput($row['company_state']); + $company_zip = sanitizeInput($row['company_zip']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); + $company_email = sanitizeInput($row['company_email']); + $company_website = sanitizeInput($row['company_website']); + $company_logo = sanitizeInput($row['company_logo']); + + // Sanitize Config vars from get_settings.php + $config_invoice_from_name = sanitizeInput($config_invoice_from_name); + $config_invoice_from_email = sanitizeInput($config_invoice_from_email); + + //Calculate the Invoice balance + $invoice_balance = $invoice_amount - $total_payments_amount; + + $email_data = []; + + //Determine if invoice has been paid then set the status accordingly + if ($invoice_balance == 0) { + + $invoice_status = "Paid"; + + if ($email_receipt == 1) { + + $subject = "Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

    We have received your payment in full for the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data[] = $email; + + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); + + // Email Logging + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + + } + + } else { + + $invoice_status = "Partial"; + + if ($email_receipt == 1) { + + $subject = "Partial Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

    We have received partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Payment Method: $payment_method
    Payment Reference: $reference
    Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + + $email_data[] = $email; + + // Add email to queue + if (!empty($email)) { + addToMailQueue($email_data); + } + + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); + + // Email Logging + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + logAction("Invoice", "Payment", "Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id", $client_id, $invoice_id); + + } + + } + + //Update Invoice Status + mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); + + */ + + //Add Payment to History + mysqli_query($mysqli,"INSERT INTO history SET history_status = '$invoice_status', history_description = 'Credit applied', history_invoice_id = $invoice_id"); + + // Logging + logAction("Invoice", "Payment", "Credit" . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " added to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id); + + customAction('invoice_pay', $invoice_id); + + $_SESSION['alert_message'] .= "Credit amount " . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " applied"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + } +} + if (isset($_GET['add_payment_stripe'])) { enforceUserPermission('module_sales', 2); From 0db6853fdec92e5ff26e804b752f10de8ba13656 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 24 Jul 2025 13:02:57 -0400 Subject: [PATCH 089/244] Updated Invoice, Quote Recurring Invoice UI to include a table border and added hover effects to line items --- guest/guest_view_invoice.php | 6 +++--- guest/guest_view_quote.php | 4 ++-- invoice.php | 6 +++--- quote.php | 8 +++++--- recurring_invoice.php | 6 +++--- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php index 175cef38..32b69411 100644 --- a/guest/guest_view_invoice.php +++ b/guest/guest_view_invoice.php @@ -238,7 +238,7 @@ if ($balance > 0) {
    -
    ' . nl2br($invoice_note) . ' + ' . nl2br($invoice_note) . ' '; if ($invoice_discount > 0) { diff --git a/post/user/quote.php b/post/user/quote.php index 84c3cea1..fb348f02 100644 --- a/post/user/quote.php +++ b/post/user/quote.php @@ -781,8 +781,8 @@ if (isset($_GET['export_quote_pdf'])) { // Totals $html .= '
    Subtotal:' . numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code) . '
    - - + +
    ' . nl2br($quote_note) . ' + ' . nl2br($quote_note) . ' '; if ($quote_discount > 0) { From 38b2a9423112987ec72e2511c469e11927ccad93 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 22 Jul 2025 15:46:17 -0400 Subject: [PATCH 079/244] Client Overview do not count Archived Clients entities and in services do not show services of archived clients --- includes/client_overview_side_nav.php | 18 +++++++++--------- services.php | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php index 71022c2b..bdd81b8f 100644 --- a/includes/client_overview_side_nav.php +++ b/includes/client_overview_side_nav.php @@ -1,31 +1,31 @@ diff --git a/services.php b/services.php index 1bd881fa..3aeb59a3 100644 --- a/services.php +++ b/services.php @@ -36,6 +36,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM services LEFT JOIN clients ON client_id = service_client_id WHERE (service_name LIKE '%$q%' OR service_description LIKE '%$q%' OR service_category LIKE '%$q%' OR client_name LIKE '%$q%') + AND client_archived_at IS NULL $access_permission_query $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" From 14691fa367cc8f3d94a1c795c9ded2665f0247f4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 22 Jul 2025 15:51:57 -0400 Subject: [PATCH 080/244] Fix Archived Query for domains to not show archived clients --- domains.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/domains.php b/domains.php index 61e2e92e..ea151d2b 100644 --- a/domains.php +++ b/domains.php @@ -9,10 +9,26 @@ if (isset($_GET['client_id'])) { require_once "includes/inc_all_client.php"; $client_query = "AND domain_client_id = $client_id"; $client_url = "client_id=$client_id&"; + // Overide Filter Header Archived + if (isset($_GET['archived']) && $_GET['archived'] == 1) { + $archived = 1; + $archive_query = "domain_archived_at IS NOT NULL"; + } else { + $archived = 0; + $archive_query = "domain_archived_at IS NULL"; + } } else { require_once "includes/inc_client_overview_all.php"; $client_query = ''; $client_url = ''; + // Overide Filter Header Archived + if (isset($_GET['archived']) && $_GET['archived'] == 1) { + $archived = 1; + $archive_query = "(client_archived_at IS NOT NULL OR domain_archived_at IS NOT NULL)"; + } else { + $archived = 0; + $archive_query = "(client_archived_at IS NULL AND domain_archived_at IS NULL)"; + } } // Perms @@ -46,7 +62,7 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, clients.*, LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id WHERE (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%' OR client_name LIKE '%$q%') - AND domain_$archive_query + AND $archive_query $access_permission_query $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); From a5aae51b1a34c2c63330787744c92f77cc60ab05 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 22 Jul 2025 16:13:04 -0400 Subject: [PATCH 081/244] Fix issue in some of the client overview entities archived will not remain selected after query, fixed issue where clients would not show in overview if in archived --- assets.php | 2 +- certificates.php | 2 +- contacts.php | 2 +- credentials.php | 11 ++++++----- domains.php | 3 ++- locations.php | 2 +- networks.php | 2 +- software.php | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/assets.php b/assets.php index 925ec95c..f758e5ef 100644 --- a/assets.php +++ b/assets.php @@ -259,7 +259,7 @@ if (mysqli_num_rows($os_sql) > 0) { SELECT DISTINCT client_id, client_name FROM clients JOIN assets ON asset_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/certificates.php b/certificates.php index 97d80525..b72c1768 100644 --- a/certificates.php +++ b/certificates.php @@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN certificates ON certificate_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/contacts.php b/contacts.php index 08ca9070..c50fc9af 100644 --- a/contacts.php +++ b/contacts.php @@ -192,7 +192,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN contacts ON contact_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/credentials.php b/credentials.php index 6373078d..818fe579 100644 --- a/credentials.php +++ b/credentials.php @@ -12,10 +12,10 @@ if (isset($_GET['client_id'])) { // Overide Filter Header Archived if (isset($_GET['archived']) && $_GET['archived'] == 1) { $archived = 1; - $archive_query = "c.credential_archived_at IS NOT NULL"; + $archive_query = "credential_archived_at IS NOT NULL"; } else { $archived = 0; - $archive_query = "c.credential_archived_at IS NULL"; + $archive_query = "credential_archived_at IS NULL"; } // Log when users load the Credentials page @@ -28,10 +28,10 @@ if (isset($_GET['client_id'])) { // Overide Filter Header Archived if (isset($_GET['archived']) && $_GET['archived'] == 1) { $archived = 1; - $archive_query = "(client_archived_at IS NOT NULL OR c.credential_archived_at IS NOT NULL)"; + $archive_query = "(client_archived_at IS NOT NULL OR credential_archived_at IS NOT NULL)"; } else { $archived = 0; - $archive_query = "(client_archived_at IS NULL AND c.credential_archived_at IS NULL)"; + $archive_query = "(client_archived_at IS NULL AND credential_archived_at IS NULL)"; } // Log when users load the Credentials page logAction("Credential", "View", "$session_name viewed the All Credentials page"); @@ -132,6 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
    @@ -200,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN credentials ON credential_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/domains.php b/domains.php index ea151d2b..fd39c9b3 100644 --- a/domains.php +++ b/domains.php @@ -94,6 +94,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
    @@ -117,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN domains ON domain_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/locations.php b/locations.php index 165245d2..abd4e6e0 100644 --- a/locations.php +++ b/locations.php @@ -151,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN locations ON location_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/networks.php b/networks.php index 96437c38..083dfae0 100644 --- a/networks.php +++ b/networks.php @@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN networks ON network_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); diff --git a/software.php b/software.php index ef51d134..1370e58f 100644 --- a/software.php +++ b/software.php @@ -114,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); SELECT DISTINCT client_id, client_name FROM clients JOIN software ON software_client_id = client_id - WHERE client_archived_at IS NULL + WHERE $archive_query $access_permission_query ORDER BY client_name ASC "); From 56c7c76ac6d1e4f2ca176dfaa8ba83ded5d95230 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 22 Jul 2025 16:15:09 -0400 Subject: [PATCH 082/244] Add option to filter footer 500 records per page --- includes/filter_footer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/filter_footer.php b/includes/filter_footer.php index 8ce64f3a..4a4d821c 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -26,6 +26,7 @@ if ($total_found_rows > 5) { +
    From 6221fd67e117fe194794ddce1b3d0504a4f4e96f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 23 Jul 2025 11:47:31 -0400 Subject: [PATCH 083/244] Fix recurring expense next run date logic for monthly and annual frequencies --- post/user/expense.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/post/user/expense.php b/post/user/expense.php index 2316ca47..05545f75 100644 --- a/post/user/expense.php +++ b/post/user/expense.php @@ -362,7 +362,11 @@ if (isset($_POST['create_recurring_expense'])) { $description = sanitizeInput($_POST['description']); $reference = sanitizeInput($_POST['reference']); - $start_date = date('Y') . "-$month-$day"; + $year = date('Y'); + if (strtotime("$year-$month-$day") < time()) { + $year++; + } + $start_date = "$year-$month-$day"; mysqli_query($mysqli,"INSERT INTO recurring_expenses SET recurring_expense_frequency = $frequency, recurring_expense_day = $day, recurring_expense_month = $month, recurring_expense_next_date = '$start_date', recurring_expense_description = '$description', recurring_expense_reference = '$reference', recurring_expense_amount = $amount, recurring_expense_currency_code = '$session_company_currency', recurring_expense_vendor_id = $vendor, recurring_expense_client_id = $client_id, recurring_expense_category_id = $category, recurring_expense_account_id = $account"); From 719a0e5efadf800e5d1708a7e86548c1675a6191 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 23 Jul 2025 13:20:06 -0400 Subject: [PATCH 084/244] Also Apply previous commit it editing recurring expenses --- post/user/expense.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/post/user/expense.php b/post/user/expense.php index 05545f75..1f3e94cf 100644 --- a/post/user/expense.php +++ b/post/user/expense.php @@ -395,7 +395,11 @@ if (isset($_POST['edit_recurring_expense'])) { $description = sanitizeInput($_POST['description']); $reference = sanitizeInput($_POST['reference']); - $start_date = date('Y') . "-$month-$day"; + $year = date('Y'); + if (strtotime("$year-$month-$day") < time()) { + $year++; + } + $start_date = "$year-$month-$day"; mysqli_query($mysqli,"UPDATE recurring_expenses SET recurring_expense_frequency = $frequency, recurring_expense_day = $day, recurring_expense_month = $month, recurring_expense_next_date = '$start_date', recurring_expense_description = '$description', recurring_expense_reference = '$reference', recurring_expense_amount = $amount, recurring_expense_currency_code = '$session_company_currency', recurring_expense_vendor_id = $vendor, recurring_expense_client_id = $client_id, recurring_expense_category_id = $category, recurring_expense_account_id = $account WHERE recurring_expense_id = $recurring_expense_id"); From a393284acdedd953e612d6822f89179e269f8d6e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 23 Jul 2025 13:24:48 -0400 Subject: [PATCH 085/244] Remove Building Icon next to company name in main side bar nav --- includes/side_nav.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/side_nav.php b/includes/side_nav.php index 24c1f288..6a800213 100644 --- a/includes/side_nav.php +++ b/includes/side_nav.php @@ -2,10 +2,8 @@
    Subtotal:' . numfmt_format_currency($currency_format, $sub_total, $quote_currency_code) . '
    - text-nowrap"> + + + + + + +
    +
    + text-nowrap bg-light"> + + + + + + = 1) && $config_module_enable_accounting == 1) { ?> + = 2) { ?> + + + + $location_address
    $location_city $location_state $location_zip
    $location_country"; + } + $contact_id = intval($row['contact_id']); + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_title = nullable_htmlentities($row['contact_title']); + $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); + $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); + $contact_extension = nullable_htmlentities($row['contact_extension']); + $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); + $contact_email = nullable_htmlentities($row['contact_email']); + $client_website = nullable_htmlentities($row['client_website']); + $client_rate = floatval($row['client_rate']); + $client_currency_code = nullable_htmlentities($row['client_currency_code']); + $client_net_terms = intval($row['client_net_terms']); + $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); + $client_referral = nullable_htmlentities($row['client_referral']); + $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); + $client_notes = nullable_htmlentities($row['client_notes']); + $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); + $client_updated_at = nullable_htmlentities($row['client_updated_at']); + $client_archived_at = nullable_htmlentities($row['client_archived_at']); + $client_is_lead = intval($row['client_lead']); + + // Abbreviation + if (empty($client_abbreviation)) { + $client_abbreviation = shortenClient($client_name); + } + + // Client Tags + + $client_tag_name_display_array = array(); + $client_tag_id_array = array(); + $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_client_tags)) { + + $client_tag_id = intval($row['tag_id']); + $client_tag_name = nullable_htmlentities($row['tag_name']); + $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } + $client_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($client_tag_icon)) { + $client_tag_icon = "tag"; + } + + $client_tag_id_array[] = $client_tag_id; + $client_tag_name_display_array[] = "$client_tag_name"; + } + $client_tags_display = implode('', $client_tag_name_display_array); + + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' "); + $row = mysqli_fetch_array($sql_invoice_amounts); + + $invoice_amounts = floatval($row['invoice_amounts']); + + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_amount_paid); + + $amount_paid = floatval($row['amount_paid']); + + $balance = $invoice_amounts - $amount_paid; + //set Text color on balance + if ($balance > 0) { + $balance_text_color = "text-danger font-weight-bold"; + } else { + $balance_text_color = ""; + } + + // Get Credit Balance + $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credit_balance); + + $credit_balance = floatval($row['credit_balance']); + + //Get Monthly Recurring Total + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_monthly_total); + + $recurring_monthly_total = floatval($row['recurring_monthly_total']); + + //Get Yearly Recurring Total + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_yearly_total); + + $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; + + $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + + ?> - - - - - = 1) && $config_module_enable_accounting == 1) { ?> - = 2) { ?> - - - - + - while ($row = mysqli_fetch_array($sql)) { - $client_id = intval($row['client_id']); - $client_name = nullable_htmlentities($row['client_name']); - $client_type = nullable_htmlentities($row['client_type']); - $location_id = intval($row['location_id']); - $location_country = nullable_htmlentities($row['location_country']); - $location_address = nullable_htmlentities($row['location_address']); - $location_city = nullable_htmlentities($row['location_city']); - $location_state = nullable_htmlentities($row['location_state']); - $location_zip = nullable_htmlentities($row['location_zip']); - 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_country"; - } - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); - $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - $contact_email = nullable_htmlentities($row['contact_email']); - $client_website = nullable_htmlentities($row['client_website']); - $client_rate = floatval($row['client_rate']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = date('Y-m-d', strtotime($row['client_created_at'])); - $client_updated_at = nullable_htmlentities($row['client_updated_at']); - $client_archived_at = nullable_htmlentities($row['client_archived_at']); - $client_is_lead = intval($row['client_lead']); + +
    + +
    + + +
    + +
    + +
    + Abbreviation:
    + Created:
    +
    - // Abbreviation - if (empty($client_abbreviation)) { - $client_abbreviation = shortenClient($client_name); - } - - // Client Tags - - $client_tag_name_display_array = array(); - $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($client_tag_icon)) { - $client_tag_icon = "tag"; + + + - $amount_paid = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - //set Text color on balance - if ($balance > 0) { - $balance_text_color = "text-danger font-weight-bold"; - } else { - $balance_text_color = ""; - } - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - ?> - - + + + + = 2) { ?> - - + + - - = 1) && $config_module_enable_accounting == 1) { ?> - - + - - = 2) { ?> - - - - - - - -
    +
    + +
    +     		+ + Client Name + + + + Primary Location + + + + Primary Contact + + + Billing Action
    +
    - +
    		- - Client Name - - - - Primary Location - - - - Primary Contact - - - Billing Action
    + $client_tag_name"; - } - $client_tags_display = implode('', $client_tag_name_display_array); + if (!empty($contact_name)) { ?> +
    + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    -
    - + + = 1) && $config_module_enable_accounting == 1) { ?> +
    		+
    + Balance +
    +
    + Paid +
    +
    + Credit +
    +
    + Monthly +
    +
    + Hourly Rate
    		- - - -
    - -
    - - -
    - -
    - -
    - Abbreviation:
    - Created:
    -
    - -     		- -
    - + +
    + - -
    - "> + Edit + - if (!empty($contact_phone)) { ?> -
    - + +
    + + Restore + + +
    + + Archive + +
    - -
    - -
    - -
    - -
    - +
    -
    - Balance -
    -
    - Paid -
    -
    - Monthly -
    -
    - Hourly Rate -
    -     		-
    - -
    - - Edit - - - -
    - - Restore - - -
    - - Archive - - -
    -
    -
    - - - - - - +
    + + + + + + + diff --git a/database_updates.php b/database_updates.php index e2d800c4..990e6993 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3768,8 +3768,39 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } - /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.3') { + + mysqli_query($mysqli, "CREATE TABLE `credits` ( + `credit_id` INT(11) NOT NULL AUTO_INCREMENT, + `credit_amount` DECIMAL(15,2) NOT NULL, + `credit_reference` VARCHAR(250) DEFAULT NULL, + `credit_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `credit_created_by` INT(11) NOT NULL, + `credit_expire_at` DATE DEFAULT NULL, + `credit_client_id` INT(11) NOT NULL, + PRIMARY KEY (`credit_id`) + )"); + + mysqli_query($mysqli, "ALTER TABLE `invoices` ADD `invoice_credit_amount` DECIMAL(15,2) NOT NULL DEFAULT 0.00 AFTER `invoice_discount_amount`"); + + mysqli_query($mysqli, "CREATE TABLE `discount_codes` ( + `discount_code_id` INT(11) NOT NULL AUTO_INCREMENT, + `discount_code_description` VARCHAR(250) DEFAULT NULL, + `discount_code_amount` DECIMAL(15,2) NOT NULL, + `discount_code` VARCHAR(200) NOT NULL, + `discount_code_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `discount_code_created_by` INT(11) NOT NULL, + `discount_code_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + `discount_code_archived_at` DATETIME NULL DEFAULT NULL, + `discount_code_expire_at` DATE DEFAULT NULL, + PRIMARY KEY (`discount_code_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + } + + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over + if (CURRENT_DATABASE_VERSION == '2.2.4') { // Delete all Recurring Payments that are Stripe mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe'"); @@ -3794,14 +3825,14 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { DROP `config_ai_api_key` "); - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); } - /* + */ - // if (CURRENT_DATABASE_VERSION == '2.2.4') { - // // Insert queries here required to update to DB version 2.2.5 + // if (CURRENT_DATABASE_VERSION == '2.2.5') { + // // Insert queries here required to update to DB version 2.2.6 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.6'"); // } } else { diff --git a/db.sql b/db.sql index 82716e33..3e8e88d4 100644 --- a/db.sql +++ b/db.sql @@ -838,6 +838,25 @@ CREATE TABLE `credentials` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `credits` +-- + +DROP TABLE IF EXISTS `credits`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `credits` ( + `credit_id` int(11) NOT NULL AUTO_INCREMENT, + `credit_amount` decimal(15,2) NOT NULL, + `credit_reference` varchar(250) DEFAULT NULL, + `credit_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `credit_created_by` int(11) NOT NULL, + `credit_expire_at` date DEFAULT NULL, + `credit_client_id` int(11) NOT NULL, + PRIMARY KEY (`credit_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `custom_fields` -- @@ -894,6 +913,27 @@ CREATE TABLE `custom_values` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `discount_codes` +-- + +DROP TABLE IF EXISTS `discount_codes`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `discount_codes` ( + `discount_code_id` int(11) NOT NULL AUTO_INCREMENT, + `discount_code_description` varchar(250) DEFAULT NULL, + `discount_code_amount` decimal(15,2) NOT NULL, + `discount_code` varchar(200) NOT NULL, + `discount_code_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `discount_code_created_by` int(11) NOT NULL, + `discount_code_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `discount_code_archived_at` datetime DEFAULT NULL, + `discount_code_expire_at` date DEFAULT NULL, + PRIMARY KEY (`discount_code_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `document_files` -- @@ -1190,6 +1230,7 @@ CREATE TABLE `invoices` ( `invoice_date` date NOT NULL, `invoice_due` date NOT NULL, `invoice_discount_amount` decimal(15,2) NOT NULL DEFAULT 0.00, + `invoice_credit_amount` decimal(15,2) NOT NULL DEFAULT 0.00, `invoice_amount` decimal(15,2) NOT NULL DEFAULT 0.00, `invoice_currency_code` varchar(200) NOT NULL, `invoice_note` text DEFAULT NULL, @@ -2718,4 +2759,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-08 14:06:43 +-- Dump completed on 2025-07-24 11:29:27 diff --git a/includes/database_version.php b/includes/database_version.php index e9eef2e5..e2bfd96b 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.3"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.4"); diff --git a/includes/filter_footer.php b/includes/filter_footer.php index 4a4d821c..a19cdb19 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -15,19 +15,21 @@ if ($total_found_rows > 5) { ?> -
    +
    -
    +
    - +
    + +
    @@ -50,16 +52,13 @@ if ($total_found_rows > 5) { // Now output something like "Showing X to Y of Z records" ?> -
    +

    Showing to of records

    - -
    -
    - +
      5) {
    +
    -"> +">
    diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index 666767f5..40cccea6 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -131,6 +131,12 @@ if (isset($_GET['client_id'])) { $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + // Get Credit Balance + $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credit_balance); + + $credit_balance = floatval($row['credit_balance']); + // Badge Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); diff --git a/includes/inc_client_top_head.php b/includes/inc_client_top_head.php index e4ed3c16..91add034 100644 --- a/includes/inc_client_top_head.php +++ b/includes/inc_client_top_head.php @@ -1,176 +1,179 @@
    -
    -
    -
    -

    -
    -
    - = 2) { ?> -
    - -
    - - Edit Client - - = 3) { ?> -
    - - Export Data - - - - -
    - - Archive Client - - -
    - - Unarchive Client - - - - = 3 && $client_archived_at) { ?> +
    +
    +

    +
    +
    + = 2) { ?> +
    +
    + +
    + + Edit Client + + = 2) { ?>
    - - Delete Client + + Add Credit - + + = 3) { ?> +
    + + Export Data + + + + +
    + + Archive Client + + +
    + + Unarchive Client + + + + = 3 && $client_archived_at) { ?> +
    + + Delete Client + + -
    -
    + +
    +
    -
    " id="clientHeader"> - -
    - -
    -
    Primary Location
    - +
    " id="clientHeader"> + +
    +
    +
    Primary Location
    + + - -
    -
    Primary Contact
    -
    - +
    - -
    - -
    - -
    - - - x$contact_extension"; - } - ?> -
    - -
    - -
    - - +
    + = 1 && $config_module_enable_accounting == 1) { ?> -
    -
    Billing
    -
    Hourly Rate - -
    -
    Paid - -
    -
    Balance - float-right"> -
    -
    Monthly Recurring - -
    -
    Net Terms - Days -
    - -
    Tax ID - -
    - + if (!empty($location_phone)) { ?> +
    +
    - +
    + +
    + +
    + +
    + +
    +
    Primary Contact
    + +
    + +
    + +
    + +
    + +
    + - = 1 && $config_module_enable_ticketing == 1) { ?> -
    -
    Support
    -
    Open Tickets - -
    -
    Closed Tickets - -
    -
    - - + if (!empty($contact_extension)) { + echo "x$contact_extension"; + } + ?>
    - + +
    + +
    + +
    + + = 1 && $config_module_enable_accounting == 1) { ?> + +
    +
    Billing
    +
    Hourly Rate + +
    +
    Paid + +
    +
    Balance + float-right"> +
    + +
    Credit + +
    + +
    Monthly Recurring + +
    +
    Net Terms + Days +
    + +
    Tax ID + +
    + +
    + + + = 1 && $config_module_enable_ticketing == 1) { ?> +
    +
    Support
    +
    Open Tickets + +
    +
    Closed Tickets +
    + +
    + + Apply Credit (Balance: ) + ">Enter Card Manually 0) { ?> @@ -543,6 +553,16 @@ if (isset($_GET['invoice_id'])) { + 0) { + ?> +
    Credit:-
    Tax:
    +
    @@ -297,7 +297,7 @@ if ($balance > 0) {
    -
    Item
    +
    @@ -331,7 +331,7 @@ if ($balance > 0) { - + diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php index 19eb9f3c..90c7c044 100644 --- a/guest/guest_view_quote.php +++ b/guest/guest_view_quote.php @@ -186,7 +186,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
    -
    Subtotal:
    Balance:
    +
    @@ -249,7 +249,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
    -
    Item
    +
    diff --git a/invoice.php b/invoice.php index f0f9ff6b..df211cd6 100644 --- a/invoice.php +++ b/invoice.php @@ -403,7 +403,7 @@ if (isset($_GET['invoice_id'])) {
    -
    Subtotal:
    +
    @@ -536,7 +536,7 @@ if (isset($_GET['invoice_id'])) {
    -
    +
    @@ -581,7 +581,7 @@ if (isset($_GET['invoice_id'])) { - + diff --git a/quote.php b/quote.php index b0d3797e..72fe8ff8 100644 --- a/quote.php +++ b/quote.php @@ -305,7 +305,7 @@ if (isset($_GET['quote_id'])) {
    -
    Balance:
    +
    @@ -457,7 +457,8 @@ if (isset($_GET['quote_id'])) {
    -
    + +
    @@ -475,12 +476,13 @@ if (isset($_GET['quote_id'])) { - +
    Subtotal:
    Total:
    + diff --git a/recurring_invoice.php b/recurring_invoice.php index a308e9f7..4084e0d7 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -272,7 +272,7 @@ if (isset($_GET['recurring_invoice_id'])) {
    - +
    @@ -414,7 +414,7 @@ if (isset($_GET['recurring_invoice_id'])) {
    -
    +
    @@ -432,7 +432,7 @@ if (isset($_GET['recurring_invoice_id'])) { - + From 4d71eb5de0b56473df15a3d20d08aed1020faa2a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 24 Jul 2025 13:24:59 -0400 Subject: [PATCH 090/244] Remove Credit once Applied, also get total credits applied --- post/user/invoice.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/post/user/invoice.php b/post/user/invoice.php index 771e3107..77636e74 100644 --- a/post/user/invoice.php +++ b/post/user/invoice.php @@ -908,13 +908,17 @@ if (isset($_POST['apply_credit'])) { $invoice_prefix = getFieldByID('invoices',$invoice_id,'invoice_prefix'); $invoice_number = getFieldByID('invoices',$invoice_id,'invoice_number'); $invoice_status = getFieldByID('invoices',$invoice_id,'invoice_status'); + $invoice_credit_amount = floatval(getFieldByID('invoices',$invoice_id,'invoice_credit_amount')); + $total_credit_amount = $invoice_credit_amount + $amount; //Check to see if amount entered is greater than the balance of the invoice if ($amount > $invoice_balance) { $_SESSION['alert_message'] = "Credit is more than the balance"; header("Location: " . $_SERVER["HTTP_REFERER"]); } else { - mysqli_query($mysqli,"UPDATE invoices SET invoice_credit_amount = $amount WHERE invoice_id = $invoice_id"); + mysqli_query($mysqli,"UPDATE invoices SET invoice_credit_amount = $total_credit_amount WHERE invoice_id = $invoice_id"); + // Remove Amounted Credit + mysqli_query($mysqli,"INSERT INTO credits SET credit_amount = -$amount, credit_created_by = $session_user_id, credit_client_id = $client_id"); /* //Add up all the payments for the invoice and get the total amount paid to the invoice From e014e516e67db429e02717fb2a9ae8213cb9f672 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 24 Jul 2025 14:58:06 -0400 Subject: [PATCH 091/244] Beta Support for Dark Mode has been added to the theme options --- admin_settings_theme.php | 9 +++++++++ database_updates.php | 5 +++++ db.sql | 3 ++- includes/database_version.php | 2 +- includes/get_settings.php | 2 +- includes/header.php | 6 +++++- post/admin/admin_settings_theme.php | 6 ++++-- 7 files changed, 27 insertions(+), 6 deletions(-) diff --git a/admin_settings_theme.php b/admin_settings_theme.php index c15bd49f..b3f70c9c 100644 --- a/admin_settings_theme.php +++ b/admin_settings_theme.php @@ -10,6 +10,15 @@ require_once "includes/inc_all_admin.php";
    +
    Dark Mode
    + +
    +
    + value="1" onchange="this.form.submit()" id="darkModeSwitch"> + +
    +
    +
    diff --git a/database_updates.php b/database_updates.php index 990e6993..0a23409c 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3799,6 +3799,11 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); } + if (CURRENT_DATABASE_VERSION == '2.2.4') { + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_theme_dark` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_theme`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); + } + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.4') { diff --git a/db.sql b/db.sql index 3e8e88d4..bc7f3677 100644 --- a/db.sql +++ b/db.sql @@ -2051,6 +2051,7 @@ CREATE TABLE `settings` ( `config_log_retention` int(11) NOT NULL DEFAULT 90, `config_module_enable_ticketing` tinyint(1) NOT NULL DEFAULT 1, `config_theme` varchar(200) DEFAULT 'blue', + `config_theme_dark` tinyint(1) NOT NULL DEFAULT 0, `config_telemetry` tinyint(1) DEFAULT 0, `config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York', `config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0, @@ -2759,4 +2760,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-24 11:29:27 +-- Dump completed on 2025-07-24 14:57:42 diff --git a/includes/database_version.php b/includes/database_version.php index e2bfd96b..0e45ae58 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.4"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.5"); diff --git a/includes/get_settings.php b/includes/get_settings.php index e4b31087..8593d760 100644 --- a/includes/get_settings.php +++ b/includes/get_settings.php @@ -128,7 +128,7 @@ $config_time_format = "H:i"; // Theme $config_theme = $row['config_theme']; -$config_theme_mode = "dark_mode"; +$config_theme_dark = intval($row['config_theme_dark']); // Telemetry $config_telemetry = intval($row['config_telemetry']); diff --git a/includes/header.php b/includes/header.php index 402a2c20..565a0df1 100644 --- a/includes/header.php +++ b/includes/header.php @@ -46,5 +46,9 @@ header("X-Frame-Options: DENY"); -"> + + +">
    diff --git a/post/admin/admin_settings_theme.php b/post/admin/admin_settings_theme.php index a539bed3..1af45c7a 100644 --- a/post/admin/admin_settings_theme.php +++ b/post/admin/admin_settings_theme.php @@ -6,12 +6,14 @@ if (isset($_POST['edit_theme_settings'])) { validateCSRFToken($_POST['csrf_token']); + $dark_mode = intval($_POST['dark_mode'] ?? 0); + $theme = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['edit_theme_settings'])); - mysqli_query($mysqli,"UPDATE settings SET config_theme = '$theme' WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_theme = '$theme', config_theme_dark = $dark_mode WHERE company_id = 1"); // Logging - logAction("Settings", "Edit", "$session_name edited theme settings"); + logAction("Settings", "Edit", "$session_name edited theme settings $dark_mode"); $_SESSION['alert_message'] = "Changed theme to $theme"; From e0a5efdfafe3f14c029085086d3987b4bb4ed322 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 24 Jul 2025 17:28:10 -0400 Subject: [PATCH 092/244] Updated Contact Asset Counts to use more optimied query and added asset counts to client listing --- ajax/ajax_client_edit.php | 10 +++--- clients.php | 69 +++++++++++++++++++++++++++++++++++--- contacts.php | 49 ++++++++++++--------------- includes/filter_footer.php | 2 +- 4 files changed, 92 insertions(+), 38 deletions(-) diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php index 77439c4e..366de4cc 100644 --- a/ajax/ajax_client_edit.php +++ b/ajax/ajax_client_edit.php @@ -32,9 +32,9 @@ while ($row = mysqli_fetch_array($sql_client_tags)) { // Generate the HTML form content using output buffering. ob_start(); ?> -
    +
    Editing Client:
    -
    @@ -42,7 +42,7 @@ ob_start(); -
    +
    • @@ -258,9 +258,9 @@ ob_start();
    -
    +
    - +
    diff --git a/clients.php b/clients.php index 5e7dcfc8..50ad3644 100644 --- a/clients.php +++ b/clients.php @@ -289,10 +289,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    Subtotal
    Total
    +
    text-nowrap bg-light"> - = 1) && $config_module_enable_accounting == 1) { ?> = 2) { ?> @@ -362,6 +363,62 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $client_abbreviation = shortenClient($client_name); } + // Counts + + // Contact Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL")); + $contact_count = $row['num']; + if ($contact_count) { + $contact_count_display = "$contact_count"; + } else { + $contact_count_display = ''; + } + + // Vendors Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL")); + $vendor_count = $row['num']; + if ($vendor_count) { + $vendor_count_display = "$vendor_count"; + } else { + $vendor_count_display = ''; + } + + // Asset Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL")); + $asset_count = $row['num']; + if ($asset_count) { + $asset_count_display = "$asset_count"; + } else { + $asset_count_display = ''; + } + + // Credential Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL")); + $credential_count = $row['num']; + if ($credential_count) { + $credential_count_display = "$credential_count"; + } else { + $credential_count_display = ''; + } + + // Software Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL")); + $software_count = $row['num']; + if ($software_count) { + $software_count_display = "$software_count"; + } else { + $software_count_display = ''; + } + + // Ticket Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL")); + $ticket_count = $row['num']; + if ($ticket_count) { + $ticket_count_display = "$ticket_count"; + } else { + $ticket_count_display = ''; + } + // Client Tags $client_tag_name_display_array = array(); @@ -432,7 +489,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + = 1) && $config_module_enable_accounting == 1) { ?> diff --git a/includes/filter_footer.php b/includes/filter_footer.php index a19cdb19..7da7c8b8 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -15,7 +15,7 @@ if ($total_found_rows > 5) { ?> -
    +
    From 6307099bc14c9688bca7e3c7aec80300519a084e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 12:18:17 -0400 Subject: [PATCH 093/244] Clarified Importing contacts when inporting clients in the client import modal window --- modals/client_import_modal.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modals/client_import_modal.php b/modals/client_import_modal.php index e6d9eacd..bd72b26a 100644 --- a/modals/client_import_modal.php +++ b/modals/client_import_modal.php @@ -9,6 +9,7 @@
    +

    Importing Multiple Contacts:
    When importing a client, only one contact (which will become the primary contact) and one location (which will become the primary location) can be added initially. To add additional contacts, you will need to click into each client, navigate to the Contacts section, and import multiple contacts individually for each client.

    Format csv file with headings & data:
    Client Name, Industry, Referral, Website, Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation

    From d115d57d1a915ff49b9dcfb11f12ffe2efe394f2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 12:35:13 -0400 Subject: [PATCH 094/244] Update sanitize_input Function to handle encoding issues such as Vietnamese. Instead of Blindly just converting to UTF-8 check the input to see if its already UTF-8 --- functions.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/functions.php b/functions.php index b8cd56b4..4ed87da4 100644 --- a/functions.php +++ b/functions.php @@ -898,30 +898,26 @@ function checkFileUpload($file, $allowed_extensions) return $secureFilename; } -function sanitizeInput($input) -{ +function sanitizeInput($input) { global $mysqli; if (!empty($input)) { - // Detect encoding - $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1', 'Windows-1252', 'ISO-8859-15'], true); - - // If not UTF-8, convert to UTF8 (primarily Windows-1252 is problematic) - if ($encoding !== 'UTF-8') { - $input = mb_convert_encoding($input, 'UTF-8', $encoding); + // Only convert encoding if it's NOT valid UTF-8 + if (!mb_check_encoding($input, 'UTF-8')) { + // Try converting from Windows-1252 as a safe default fallback + $input = mb_convert_encoding($input, 'UTF-8', 'Windows-1252'); } } // Remove HTML and PHP tags $input = strip_tags((string) $input); - // Remove white space from beginning and end of input + // Trim white space $input = trim($input); - // Escape special characters + // Escape for SQL $input = mysqli_real_escape_string($mysqli, $input); - // Return sanitized input return $input; } From 219fe59aa26c24fbc89aaa5a14a8d52352ae1fb4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 12:44:43 -0400 Subject: [PATCH 095/244] Use Badge Pill for rounded Badges in client side nav --- includes/client_side_nav.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 7899113d..6fc74f3b 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -61,7 +61,7 @@ Tickets 0) { ?> - +

    @@ -202,7 +202,7 @@ 0) { ?> - +

    @@ -216,7 +216,7 @@ 0) { ?> - +

    @@ -279,7 +279,7 @@ Invoices 0) { ?> - +

    From 5f26f68a0488f43fd0c60dc3736e9c283224801a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 13:34:05 -0400 Subject: [PATCH 096/244] Clarify Email during company setup, instead of just enter email enter company email for the placeholder https://youtu.be/Ul10HXaPwNk?t=2079 --- setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.php b/setup.php index 63f658d4..6d915d84 100644 --- a/setup.php +++ b/setup.php @@ -1272,7 +1272,7 @@ if (isset($_POST['add_telemetry'])) {
    - +
    From d5ec601d758e41a89e5195b469b11a19d6473f35 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 13:36:07 -0400 Subject: [PATCH 097/244] add eg info@company.com for further clarification on company setup --- setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.php b/setup.php index 6d915d84..a8c9425b 100644 --- a/setup.php +++ b/setup.php @@ -1272,7 +1272,7 @@ if (isset($_POST['add_telemetry'])) {
    - +
    From 699546f531629b3be163e9388b2cbd352f0a1123 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 25 Jul 2025 14:21:55 -0400 Subject: [PATCH 098/244] In Client Import Clarify CSV as Primary Contact Name instead of just Contact Name same with Location name use Primary Location Name, makes it much clearer when importing clients --- modals/client_import_modal.php | 2 +- post/user/client.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modals/client_import_modal.php b/modals/client_import_modal.php index bd72b26a..d9d450c9 100644 --- a/modals/client_import_modal.php +++ b/modals/client_import_modal.php @@ -10,7 +10,7 @@

    Importing Multiple Contacts:
    When importing a client, only one contact (which will become the primary contact) and one location (which will become the primary location) can be added initially. To add additional contacts, you will need to click into each client, navigate to the Contacts section, and import multiple contacts individually for each client.

    -

    Format csv file with headings & data:
    Client Name, Industry, Referral, Website, Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation

    +

    Format csv file with headings & data:
    Client Name, Industry, Referral, Website, Primary Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Primary Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation

    diff --git a/post/user/client.php b/post/user/client.php index c2ff552d..cb6ad3dc 100644 --- a/post/user/client.php +++ b/post/user/client.php @@ -330,7 +330,7 @@ if (isset($_POST['export_clients_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Client Name', 'Industry', 'Referral', 'Website', 'Location Name', 'Location Phone', 'Location Address', 'City', 'State', 'Postal Code', 'Country', 'Contact Name', 'Title', 'Contact Phone', 'Extension', 'Contact Mobile', 'Contact Email', 'Hourly Rate', 'Currency', 'Payment Terms', 'Tax ID', 'Abbreviation'); + $fields = array('Client Name', 'Industry', 'Referral', 'Website', 'Primary Location Name', 'Location Phone', 'Location Address', 'City', 'State', 'Postal Code', 'Country', 'Primary Contact Name', 'Title', 'Contact Phone', 'Extension', 'Contact Mobile', 'Contact Email', 'Hourly Rate', 'Currency', 'Payment Terms', 'Tax ID', 'Abbreviation'); fputcsv($f, $fields, $delimiter); //output each row of the data, format line as csv and write to file pointer @@ -574,7 +574,7 @@ if (isset($_GET['download_clients_csv_template'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Client Name', 'Industry', 'Referral', 'Website', 'Location Name', 'Location Phone', 'Location Address', 'City', 'State', 'Postal Code', 'Country', 'Contact Name', 'Title', 'Contact Phone', 'Extension', 'Contact Mobile', 'Contact Email', 'Hourly Rate', 'Currency', 'Payment Terms', 'Tax ID', 'Abbreviation'); + $fields = array('Client Name', 'Industry', 'Referral', 'Website', 'Primary Location Name', 'Location Phone', 'Location Address', 'City', 'State', 'Postal Code', 'Country', 'Primary Contact Name', 'Title', 'Contact Phone', 'Extension', 'Contact Mobile', 'Contact Email', 'Hourly Rate', 'Currency', 'Payment Terms', 'Tax ID', 'Abbreviation'); fputcsv($f, $fields, $delimiter); //move back to beginning of file From 4906e06bf162eb870d1e0c8959e0ee57188f1ad7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 27 Jul 2025 21:24:14 -0400 Subject: [PATCH 099/244] Initialized migrating modals into entity folders and modals out of ajax and start working on moving admin items to new admin directory --- admin/includes/footer.php | 53 +++ admin/includes/header.php | 54 +++ admin/includes/inc_all_admin.php | 16 + admin/includes/modal_footer.php | 9 + admin/includes/modal_header.php | 13 + admin/includes/side_nav.php | 305 ++++++++++++++ admin/modals/roles/role_add.php | 58 +++ admin/modals/roles/role_edit.php | 153 +++++++ admin/modals/users/user_add.php | 156 ++++++++ .../modals/users/user_all_reset_password.php | 31 ++ admin/modals/users/user_archive.php | 16 + admin/modals/users/user_edit.php | 204 ++++++++++ admin/modals/users/user_export.php | 21 + admin/modals/users/user_invite.php | 45 +++ admin/post/role.php | 89 +++++ admin/post/user.php | 373 ++++++++++++++++++ admin/post/user_model.php | 6 + admin/roles.php | 151 +++++++ admin/users.php | 239 +++++++++++ clients.php | 20 +- includes/ajax_header.php | 6 +- includes/modal_footer.php | 9 + includes/modal_header.php | 13 + .../client_add.php} | 0 .../client_bulk_assign_tags.php} | 0 .../client_bulk_edit_hourly_rate.php} | 0 .../client_bulk_edit_industry.php} | 0 .../client_bulk_edit_referral.php} | 0 .../client_bulk_email.php} | 0 .../client_credit_add.php} | 0 .../client_delete.php} | 0 .../client_download_pdf.php} | 0 .../clients/client_edit.php | 38 +- .../client_export.php} | 0 .../client_import.php} | 0 post.php | 2 - robots.txt | 3 +- 37 files changed, 2046 insertions(+), 37 deletions(-) create mode 100644 admin/includes/footer.php create mode 100644 admin/includes/header.php create mode 100644 admin/includes/inc_all_admin.php create mode 100644 admin/includes/modal_footer.php create mode 100644 admin/includes/modal_header.php create mode 100644 admin/includes/side_nav.php create mode 100644 admin/modals/roles/role_add.php create mode 100644 admin/modals/roles/role_edit.php create mode 100644 admin/modals/users/user_add.php create mode 100644 admin/modals/users/user_all_reset_password.php create mode 100644 admin/modals/users/user_archive.php create mode 100644 admin/modals/users/user_edit.php create mode 100644 admin/modals/users/user_export.php create mode 100644 admin/modals/users/user_invite.php create mode 100644 admin/post/role.php create mode 100644 admin/post/user.php create mode 100644 admin/post/user_model.php create mode 100644 admin/roles.php create mode 100644 admin/users.php create mode 100644 includes/modal_footer.php create mode 100644 includes/modal_header.php rename modals/{client_add_modal.php => clients/client_add.php} (100%) rename modals/{client_bulk_assign_tags_modal.php => clients/client_bulk_assign_tags.php} (100%) rename modals/{client_bulk_edit_hourly_rate_modal.php => clients/client_bulk_edit_hourly_rate.php} (100%) rename modals/{client_bulk_edit_industry_modal.php => clients/client_bulk_edit_industry.php} (100%) rename modals/{client_bulk_edit_referral_modal.php => clients/client_bulk_edit_referral.php} (100%) rename modals/{client_bulk_email_modal.php => clients/client_bulk_email.php} (100%) rename modals/{client_credit_add_modal.php => clients/client_credit_add.php} (100%) rename modals/{client_delete_modal.php => clients/client_delete.php} (100%) rename modals/{client_download_pdf_modal.php => clients/client_download_pdf.php} (100%) rename ajax/ajax_client_edit.php => modals/clients/client_edit.php (93%) rename modals/{client_export_modal.php => clients/client_export.php} (100%) rename modals/{client_import_modal.php => clients/client_import.php} (100%) diff --git a/admin/includes/footer.php b/admin/includes/footer.php new file mode 100644 index 00000000..60235990 --- /dev/null +++ b/admin/includes/footer.php @@ -0,0 +1,53 @@ + + + +

    ITFlow   ·   Docs   ·   Forum   ·   Services

    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/admin/includes/header.php b/admin/includes/header.php new file mode 100644 index 00000000..8a22fd82 --- /dev/null +++ b/admin/includes/header.php @@ -0,0 +1,54 @@ + + + + + + + + + + + <?php echo $session_company_name; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"> +
    diff --git a/admin/includes/inc_all_admin.php b/admin/includes/inc_all_admin.php new file mode 100644 index 00000000..53d050f9 --- /dev/null +++ b/admin/includes/inc_all_admin.php @@ -0,0 +1,16 @@ +Tell your admin: Your role does not have admin access."); +} +require_once "includes/header.php"; +require_once "../includes/top_nav.php"; +require_once "includes/side_nav.php"; +require_once "../includes/inc_wrapper.php"; +require_once "../includes/inc_alert_feedback.php"; +require_once "../includes/filter_header.php"; +require_once "../includes/app_version.php"; diff --git a/admin/includes/modal_footer.php b/admin/includes/modal_footer.php new file mode 100644 index 00000000..4bbe5766 --- /dev/null +++ b/admin/includes/modal_footer.php @@ -0,0 +1,9 @@ + + + + $content]); +?> \ No newline at end of file diff --git a/admin/includes/modal_header.php b/admin/includes/modal_header.php new file mode 100644 index 00000000..695f098a --- /dev/null +++ b/admin/includes/modal_header.php @@ -0,0 +1,13 @@ + 'ID missing.']); +// exit; +//} diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php new file mode 100644 index 00000000..23e8af1a --- /dev/null +++ b/admin/includes/side_nav.php @@ -0,0 +1,305 @@ + + diff --git a/admin/modals/roles/role_add.php b/admin/modals/roles/role_add.php new file mode 100644 index 00000000..0112960d --- /dev/null +++ b/admin/modals/roles/role_add.php @@ -0,0 +1,58 @@ + diff --git a/admin/modals/roles/role_edit.php b/admin/modals/roles/role_edit.php new file mode 100644 index 00000000..9b1d967f --- /dev/null +++ b/admin/modals/roles/role_edit.php @@ -0,0 +1,153 @@ + +
    +
    Editing role: +
    + +
    +
    + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    Module permissions do not apply to Admins.
    + + + + +
    + +
    + +
    + + +
    + + + +
    + +
    + +
    +
    + + +
    + + + +
    +
    +
    +
    New User
    + +
    +
    + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    > +
    + + +
    +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected. +
    + +
      +
    • +
      + + +
      +
      • + + +
    • +
      + + +
      +
      • + + + +
    + +
    + +
    + +
    +
    + + +
    + +
    +
    +
    diff --git a/admin/modals/users/user_all_reset_password.php b/admin/modals/users/user_all_reset_password.php new file mode 100644 index 00000000..a68dfdc5 --- /dev/null +++ b/admin/modals/users/user_all_reset_password.php @@ -0,0 +1,31 @@ + diff --git a/admin/modals/users/user_archive.php b/admin/modals/users/user_archive.php new file mode 100644 index 00000000..8662ad4c --- /dev/null +++ b/admin/modals/users/user_archive.php @@ -0,0 +1,16 @@ + diff --git a/admin/modals/users/user_edit.php b/admin/modals/users/user_edit.php new file mode 100644 index 00000000..7cd470a1 --- /dev/null +++ b/admin/modals/users/user_edit.php @@ -0,0 +1,204 @@ + +
    +
    Editing user: +
    + +
    + + + +
    + + + +
    + +
    + +
    + +
    + + "> + + + + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + > + +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected. +
    + +
      +
    • +
      + + +
      +
      • + + + +
    • +
      + > + +
      +
      • + + + +
    + +
    + +
    + +
    +
    + + +
    + + + +
    +
    +
    +
    Export Users to CSV
    + +
    +
    +
    + +
    +
    + + +
    + +
    +
    + diff --git a/admin/modals/users/user_invite.php b/admin/modals/users/user_invite.php new file mode 100644 index 00000000..21c93356 --- /dev/null +++ b/admin/modals/users/user_invite.php @@ -0,0 +1,45 @@ + diff --git a/admin/post/role.php b/admin/post/role.php new file mode 100644 index 00000000..af659e70 --- /dev/null +++ b/admin/post/role.php @@ -0,0 +1,89 @@ + created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_role'])) { + + validateCSRFToken($_POST['csrf_token']); + + // Update role metadata + $role_id = sanitizeInput($_POST['role_id']); + $name = sanitizeInput($_POST['role_name']); + $description = sanitizeInput($_POST['role_description']); + $admin = intval($_POST['role_is_admin']); + + mysqli_query($mysqli, "UPDATE user_roles SET role_name = '$name', role_description = '$description', role_is_admin = $admin WHERE role_id = $role_id"); + + // Update role access levels + mysqli_query($mysqli, "DELETE FROM user_role_permissions WHERE user_role_id = $role_id"); + foreach ($_POST as $key => $value) { + if (str_contains($key, '##module_')){ + $module_id = intval(explode('##', $key)[0]); + $access_level = intval($value); + + if ($access_level > 0) { + mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = $role_id, module_id = $module_id, user_role_permission_level = $access_level"); + } + } + + } + + // Logging + logAction("User Role", "Edit", "$session_name edited user role $name", 0, $role_id); + + $_SESSION['alert_message'] = "User Role $name edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['archive_role'])) { + + validateCSRFToken($_GET['csrf_token']); + + $role_id = intval($_GET['archive_role']); + + // Check role isn't in use + $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(user_id) FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL"); + $role_user_count = mysqli_fetch_row($sql_role_user_count)[0]; + if ($role_user_count != 0) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Role must not in use to archive it"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + + mysqli_query($mysqli, "UPDATE user_roles SET role_archived_at = NOW() WHERE role_id = $role_id"); + + // Logging + $role_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT role_name FROM user_roles WHERE role_id = $role_id LIMIT 1")); + $role_name = sanitizeInput($role_details['role_name']); + logAction("User Role", "Archive", "$session_name archived user role $role_name", 0, $role_id); + + $_SESSION['alert_message'] = "User Role archived"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/admin/post/user.php b/admin/post/user.php new file mode 100644 index 00000000..00a42595 --- /dev/null +++ b/admin/post/user.php @@ -0,0 +1,373 @@ +
    An ITFlow account has been setup for you. Please change your password upon login.

    Username: $email
    Password: $password
    Login URL: https://$config_base_url/login.php?key=$config_login_key_secret

    --
    $company_name - Support
    $config_ticket_from_email"; + + $data = [ + [ + 'from' => $config_mail_from_email, + 'from_name' => $config_mail_from_name, + 'recipient' => $email, + 'recipient_name' => $name, + 'subject' => $subject, + 'body' => $body + ] + ]; + $mail = addToMailQueue($data); + + if ($mail !== true) { + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email'"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email regarding $subject. $mail', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $user_id"); + } + + } + + // Logging + logAction("User", "Create", "$session_name created user $name", 0, $user_id); + + $_SESSION['alert_message'] = "User $name created" . $extended_alert_description; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_user'])) { + + validateCSRFToken($_POST['csrf_token']); + + require_once 'post/admin/admin_user_model.php'; + + $user_id = intval($_POST['user_id']); + $new_password = trim($_POST['new_password']); + + // Update Client Access + mysqli_query($mysqli,"DELETE FROM user_client_permissions WHERE user_id = $user_id"); + if (isset($_POST['clients'])) { + foreach($_POST['clients'] as $client_id) { + $client_id = intval($client_id); + mysqli_query($mysqli,"INSERT INTO user_client_permissions SET user_id = $user_id, client_id = $client_id"); + } + } + + // Get current Avatar + $sql = mysqli_query($mysqli, "SELECT user_avatar FROM users WHERE user_id = $user_id"); + $row = mysqli_fetch_array($sql); + $existing_file_name = sanitizeInput($row['user_avatar']); + + $extended_log_description = ''; + if (!empty($_POST['2fa'])) { + $two_fa = $_POST['2fa']; + } + + if (!file_exists("uploads/users/$user_id/")) { + mkdir("uploads/users/$user_id"); + } + + // Check for and process image/photo + $extended_alert_description = ''; + if (isset($_FILES['file']['tmp_name'])) { + if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) { + + $file_tmp_path = $_FILES['file']['tmp_name']; + + // directory in which the uploaded file will be moved + $upload_file_dir = "uploads/users/$user_id/"; + $dest_path = $upload_file_dir . $new_file_name; + move_uploaded_file($file_tmp_path, $dest_path); + + // Delete old file + unlink("../uploads/users/$user_id/$existing_file_name"); + + // Set Avatar + mysqli_query($mysqli, "UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id"); + $extended_alert_description = '. File successfully uploaded.'; + + } + } + + mysqli_query($mysqli, "UPDATE users SET user_name = '$name', user_email = '$email', user_role_id = $role WHERE user_id = $user_id"); + + if (!empty($new_password)) { + $new_password = password_hash($new_password, PASSWORD_DEFAULT); + $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($_POST['new_password'])); + mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id"); + //Extended Logging + $extended_log_description .= ", password changed"; + } + + if (!empty($two_fa) && $two_fa == 'disable') { + mysqli_query($mysqli, "UPDATE users SET user_token = '' WHERE user_id = '$user_id'"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name disabled 2FA for $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + } + + //Update User Settings + mysqli_query($mysqli, "UPDATE user_settings SET user_config_force_mfa = $force_mfa WHERE user_id = $user_id"); + + // Logging + logAction("User", "Edit", "$session_name edited user $name", 0, $user_id); + + $_SESSION['alert_message'] = "User $name updated" . $extended_alert_description; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['activate_user'])) { + + validateCSRFToken($_GET['csrf_token']); + + $user_id = intval($_GET['activate_user']); + + // Get User Name + $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); + $row = mysqli_fetch_array($sql); + $user_name = sanitizeInput($row['user_name']); + + mysqli_query($mysqli, "UPDATE users SET user_status = 1 WHERE user_id = $user_id"); + + // Logging + logAction("User", "Activate", "$session_name activated user $user_name", 0, $user_id); + + $_SESSION['alert_message'] = "User $user_name activated"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['disable_user'])) { + + validateCSRFToken($_GET['csrf_token']); + + $user_id = intval($_GET['disable_user']); + + // Get User Name + $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); + $row = mysqli_fetch_array($sql); + $user_name = sanitizeInput($row['user_name']); + + mysqli_query($mysqli, "UPDATE users SET user_status = 0 WHERE user_id = $user_id"); + + // Un-assign tickets + mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = 0 WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL"); + mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_assigned_to = 0 WHERE recurring_ticket_assigned_to = $user_id"); + + // Logging + logAction("User", "Disable", "$session_name disabled user $name", 0, $user_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "User $user_name disabled"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['revoke_remember_me'])) { + + validateCSRFToken($_GET['csrf_token']); + + $user_id = intval($_GET['revoke_remember_me']); + + // Get User Name + $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id")); + $user_name = sanitizeInput($row['user_name']); + + mysqli_query($mysqli, "DELETE FROM remember_tokens WHERE remember_token_user_id = $user_id"); + + // Logging + logAction("User", "Edit", "$session_name revoked all remember me tokens for user $user_name", 0, $user_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "User $user_name remember me tokens revoked"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['archive_user'])) { + + validateCSRFToken($_GET['csrf_token']); + + // Variables from GET + $user_id = intval($_GET['archive_user']); + $password = password_hash(randomString(), PASSWORD_DEFAULT); + + // Get user details + $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); + $row = mysqli_fetch_array($sql); + $name = sanitizeInput($row['user_name']); + + // Archive user query + mysqli_query($mysqli, "UPDATE users SET user_name = '$name (archived)', user_password = '$password', user_status = 0, user_specific_encryption_ciphertext = '', user_archived_at = NOW() WHERE user_id = $user_id"); + + // Logging + logAction("User", "Archive", "$session_name archived user $name", 0, $user_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "User $name archived"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['export_users_csv'])) { + + //get records from database + $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_roles ON user_role_id = role_id ORDER BY user_name ASC"); + + $count = mysqli_num_rows($sql); + + if ($count > 0) { + $delimiter = ","; + $filename = "Users-" . date('Y-m-d') . ".csv"; + + //create a file pointer + $f = fopen('php://memory', 'w'); + + //set column headers + $fields = array('Name', 'Email', 'Role', 'Status', 'Creation Date'); + fputcsv($f, $fields, $delimiter); + + //output each row of the data, format line as csv and write to file pointer + while($row = $sql->fetch_assoc()) { + + $user_status = intval($row['user_status']); + if ($user_status == 2) { + $user_status_display = "Invited"; + } elseif ($user_status == 1) { + $user_status_display = "Active"; + } else{ + $user_status_display = "Disabled"; + } + + $lineData = array($row['user_name'], $row['user_email'], $row['role_name'], $user_status_display, $row['user_created_at']); + fputcsv($f, $lineData, $delimiter); + } + + //move back to beginning of file + fseek($f, 0); + + //set headers to download file rather than displayed + header('Content-Type: text/csv'); + header('Content-Disposition: attachment; filename="' . $filename . '";'); + + //output all remaining data on a file pointer + fpassthru($f); + + // Logging + logAction("User", "Export", "$session_name exported $count user(s) to a CSV file"); + } + exit; + +} + +if (isset($_POST['ir_reset_user_password'])) { + + // Incident response: allow mass reset of agent passwords + + validateCSRFToken($_POST['csrf_token']); + + // Confirm logged-in user password, for security + $admin_password = $_POST['admin_password']; + $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $session_user_id"); + $userRow = mysqli_fetch_array($sql); + if (!password_verify($admin_password, $userRow['user_password'])) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Incorrect password."; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; + } + + // Get agents/users, other than the current user + $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE (user_archived_at IS NULL AND user_id != $session_user_id)"); + + // Reset passwords + while ($row = mysqli_fetch_array($sql_users)) { + $user_id = intval($row['user_id']); + $user_email = sanitizeInput($row['user_email']); + $new_password = randomString(); + $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($new_password)); + + echo $user_email . " -- " . $new_password; // Show + $new_password = password_hash($new_password, PASSWORD_DEFAULT); + + mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id"); + + echo "

    "; + } + + // Logging + logAction("User", "Edit", "$session_name reset ALL user passwords"); + + exit; // Stay on the plain text password page + +} diff --git a/admin/post/user_model.php b/admin/post/user_model.php new file mode 100644 index 00000000..ad331c06 --- /dev/null +++ b/admin/post/user_model.php @@ -0,0 +1,6 @@ + +
    Roles are still in development. Permissions may not be fully enforced.
    + +
    +
    +

    Roles

    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    @@ -313,6 +313,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +     		Billing Action
    - + + + @@ -518,7 +579,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    		- +
    + text-nowrap"> + + + + + + + + + + + + + + + + + + + +
    + + Role + + Members + + Admin + + Action
    + + + +
    +     		+ +
    + +
    + + + Edit + + + +
    + + Archive + + + +
    +
    + +
    +
    + +
    +
    + + + +
    +
    +

    Users

    +
    +
    + + +
    + + 1) { ?> + Export +
    + IR + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + Invited"; + } elseif ($user_status == 1) { + $user_status_display = "Active"; + } else{ + $user_status_display = "Disabled"; + } + $user_avatar = nullable_htmlentities($row['user_avatar']); + $user_token = nullable_htmlentities($row['user_token']); + if(empty($user_token)) { + $mfa_status_display = ""; + } else { + $mfa_status_display = ""; + } + $user_config_force_mfa = intval($row['user_config_force_mfa']); + $user_role = intval($row['user_role_id']); + $user_role_display = nullable_htmlentities($row['role_name']); + $user_initials = nullable_htmlentities(initials($user_name)); + + $sql_last_login = mysqli_query( + $mysqli, + "SELECT * FROM logs + WHERE log_user_id = $user_id AND log_type = 'Login' + ORDER BY log_id DESC LIMIT 1" + ); + if (mysqli_num_rows($sql_last_login) == 0) { + $last_login = "Never logged in"; + } else { + $row = mysqli_fetch_array($sql_last_login); + $log_created_at = nullable_htmlentities($row['log_created_at']); + $log_ip = nullable_htmlentities($row['log_ip']); + $log_user_agent = nullable_htmlentities($row['log_user_agent']); + $log_user_os = getOS($log_user_agent); + $log_user_browser = getWebBrowser($log_user_agent); + $last_login = "$log_created_at
    $log_user_os
    $log_user_browser
    $log_ip
    "; + } + + // Get User Client Access Permissions + $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id"); + $client_access_array = []; + while ($row = mysqli_fetch_assoc($user_client_access_sql)) { + $client_access_array[] = intval($row['client_id']); + } + + $sql_remember_tokens = mysqli_query($mysqli, "SELECT * FROM remember_tokens WHERE remember_token_user_id = $user_id"); + $remember_token_count = mysqli_num_rows($sql_remember_tokens); + + + + ?> + + + + + + + + + + + + + +
    + + Name + + + + Email + + + + Role + + + + Status + + MFA + Last Login + Action
    + + data-toggle="ajax-modal" + data-ajax-url="modals/users/user_edit.php" + data-ajax-id="" + + > + + "> + + + + + +
    + + +
    +     +     		+ +
    + +
    + + Edit + + 0) { ?> + Revoke Remember Tokens + + + + + Activate + + + + Disable + + +
    + + Archive + +
    +
    + +
    +
    + +
    +
    + + +Paid
    - Credit + Credit
    Monthly @@ -584,7 +584,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    Edit @@ -613,11 +613,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -628,7 +628,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + + $content]); +?> \ No newline at end of file diff --git a/includes/modal_header.php b/includes/modal_header.php new file mode 100644 index 00000000..74f3848c --- /dev/null +++ b/includes/modal_header.php @@ -0,0 +1,13 @@ + 'ID missing.']); +// exit; +//} diff --git a/modals/client_add_modal.php b/modals/clients/client_add.php similarity index 100% rename from modals/client_add_modal.php rename to modals/clients/client_add.php diff --git a/modals/client_bulk_assign_tags_modal.php b/modals/clients/client_bulk_assign_tags.php similarity index 100% rename from modals/client_bulk_assign_tags_modal.php rename to modals/clients/client_bulk_assign_tags.php diff --git a/modals/client_bulk_edit_hourly_rate_modal.php b/modals/clients/client_bulk_edit_hourly_rate.php similarity index 100% rename from modals/client_bulk_edit_hourly_rate_modal.php rename to modals/clients/client_bulk_edit_hourly_rate.php diff --git a/modals/client_bulk_edit_industry_modal.php b/modals/clients/client_bulk_edit_industry.php similarity index 100% rename from modals/client_bulk_edit_industry_modal.php rename to modals/clients/client_bulk_edit_industry.php diff --git a/modals/client_bulk_edit_referral_modal.php b/modals/clients/client_bulk_edit_referral.php similarity index 100% rename from modals/client_bulk_edit_referral_modal.php rename to modals/clients/client_bulk_edit_referral.php diff --git a/modals/client_bulk_email_modal.php b/modals/clients/client_bulk_email.php similarity index 100% rename from modals/client_bulk_email_modal.php rename to modals/clients/client_bulk_email.php diff --git a/modals/client_credit_add_modal.php b/modals/clients/client_credit_add.php similarity index 100% rename from modals/client_credit_add_modal.php rename to modals/clients/client_credit_add.php diff --git a/modals/client_delete_modal.php b/modals/clients/client_delete.php similarity index 100% rename from modals/client_delete_modal.php rename to modals/clients/client_delete.php diff --git a/modals/client_download_pdf_modal.php b/modals/clients/client_download_pdf.php similarity index 100% rename from modals/client_download_pdf_modal.php rename to modals/clients/client_download_pdf.php diff --git a/ajax/ajax_client_edit.php b/modals/clients/client_edit.php similarity index 93% rename from ajax/ajax_client_edit.php rename to modals/clients/client_edit.php index 366de4cc..fa4df170 100644 --- a/ajax/ajax_client_edit.php +++ b/modals/clients/client_edit.php @@ -1,6 +1,6 @@ + +
    - - -
    -
    @@ -129,7 +127,7 @@ ob_start();
    @@ -169,7 +167,7 @@ ob_start(); @@ -265,4 +263,4 @@ ob_start(); Date: Mon, 28 Jul 2025 13:32:28 -0400 Subject: [PATCH 100/244] Moved admin_ to /admin, user_ to user report_ to /reports each have their own post includes modals directories created seperate headers and footer. Also did the same for xcustom, more work to me done --- admin_ai_model.php => admin/ai_model.php | 0 .../ai_provider.php | 0 admin_api.php => admin/api.php | 0 admin_app_log.php => admin/app_log.php | 0 admin_audit_log.php => admin/audit_log.php | 0 admin_backup.php => admin/backup.php | 0 admin_category.php => admin/category.php | 0 .../custom_link.php | 0 admin_debug.php => admin/debug.php | 0 .../document_template.php | 0 .../document_template_details.php | 0 .../identity_provider.php | 0 admin/includes/side_nav.php | 82 ++-- admin/index.php | 4 + admin_mail_queue.php => admin/mail_queue.php | 0 admin/modals/users/user_add.php | 2 +- .../payment_method.php | 0 .../payment_provider.php | 0 admin/post.php | 33 ++ .../post/ai_model.php | 0 .../post/ai_provider.php | 0 .../admin/admin_api.php => admin/post/api.php | 0 .../admin_backup.php => admin/post/backup.php | 0 .../post/category.php | 0 {post/user => admin/post}/category_model.php | 0 .../post/custom_field.php | 0 .../post/custom_field_model.php | 0 .../post/custom_link.php | 0 .../post/document_template.php | 0 .../post/identity_provider.php | 0 .../post/mail_queue.php | 0 .../post/payment_method.php | 0 .../post/payment_provider.php | 0 .../post/project_template.php | 0 .../post/saved_payment_method.php | 0 .../post/settings_ai.php | 0 .../post/settings_company.php | 0 .../post/settings_default.php | 0 .../post/settings_invoice.php | 0 .../post/settings_localization.php | 0 .../post/settings_mail.php | 0 .../post/settings_module.php | 0 .../post/settings_notification.php | 0 .../post/settings_online_payment.php | 0 .../post/settings_online_payment_clients.php | 0 .../post/settings_project.php | 0 .../post/settings_quote.php | 0 .../post/settings_security.php | 0 .../post/settings_telemetry.php | 0 .../post/settings_theme.php | 0 .../post/settings_ticket.php | 0 .../post/software_template.php | 0 .../admin/admin_tag.php => admin/post/tag.php | 0 {post/user => admin/post}/tag_model.php | 0 .../admin/admin_tax.php => admin/post/tax.php | 0 .../post/ticket_status.php | 0 .../post/ticket_template.php | 0 .../admin_update.php => admin/post/update.php | 0 admin/post/user_model.php | 2 + admin/post/{user.php => users.php} | 4 +- .../post/vendor_template.php | 0 .../project_template.php | 0 .../project_template_details.php | 0 .../saved_payment_method.php | 0 .../settings_ai.php | 0 .../settings_company.php | 0 .../settings_custom_fields.php | 0 .../settings_default.php | 0 .../settings_invoice.php | 0 .../settings_localization.php | 0 .../settings_mail.php | 0 .../settings_module.php | 0 .../settings_notification.php | 0 .../settings_online_payment.php | 0 .../settings_online_payment_clients.php | 0 .../settings_project.php | 0 .../settings_quote.php | 0 .../settings_security.php | 0 .../settings_telemetry.php | 0 .../settings_theme.php | 0 .../settings_ticket.php | 0 .../software_template.php | 0 admin_tag.php => admin/tag.php | 0 admin_tax.php => admin/tax.php | 0 .../ticket_status.php | 0 .../ticket_template.php | 0 .../ticket_template_details.php | 0 admin_update.php => admin/update.php | 0 .../vendor_template.php | 0 includes/admin_side_nav.php | 305 -------------- includes/inc_all_admin.php | 16 - includes/inc_all_reports.php | 19 - includes/side_nav.php | 2 +- includes/top_nav.php | 2 +- post/{user => }/account.php | 0 post/admin/admin_role.php | 89 ----- post/admin/admin_user.php | 371 ------------------ post/admin/admin_user_model.php | 7 - post/{user => }/asset.php | 0 post/{user => }/asset_interface_model.php | 0 post/{user => }/asset_model.php | 0 post/{user => }/budget.php | 0 post/{user => }/category.php | 0 ..._category_model.php => category_model.php} | 0 post/{user => }/certificate.php | 0 post/{user => }/certificate_model.php | 0 post/{user => }/client.php | 0 post/{user => }/client_model.php | 0 post/{user => }/contact.php | 0 post/{user => }/contact_model.php | 0 post/{user => }/credential.php | 0 post/{user => }/credential_model.php | 0 post/{user => }/credit.php | 0 post/{user => }/document.php | 0 post/{user => }/document_model.php | 0 post/{user => }/domain.php | 0 post/{user => }/domain_model.php | 0 post/{user => }/event.php | 0 post/{user => }/event_model.php | 0 post/{user => }/expense.php | 0 post/{user => }/expense_model.php | 0 post/{user => }/file.php | 0 post/{user => }/folder.php | 0 post/{user => }/invoice.php | 0 post/{user => }/invoice_model.php | 0 post/{user => }/location.php | 0 post/{user => }/location_model.php | 0 post/{user => }/network.php | 0 post/{user => }/network_model.php | 0 post/{user => }/product.php | 0 post/{user => }/product_model.php | 0 post/{user => }/profile.php | 0 post/{user => }/project.php | 0 post/{user => }/quote.php | 0 post/{user => }/quote_model.php | 0 post/{user => }/rack.php | 0 post/{user => }/revenue.php | 0 post/{user => }/service.php | 0 post/{user => }/software.php | 0 post/{user => }/tag.php | 0 .../admin_tag_model.php => tag_model.php} | 0 post/{user => }/task.php | 0 post/{user => }/ticket.php | 0 post/{user => }/ticket_recurring_model.php | 0 post/{user => }/transfer.php | 0 post/{user => }/transfer_model.php | 0 post/{user => }/trip.php | 0 post/{user => }/trip_model.php | 0 post/{user => }/vendor.php | 0 post/{user => }/vendor_contact.php | 0 post/{user => }/vendor_contact_model.php | 0 post/{user => }/vendor_model.php | 0 post/xcustom/readme.php | 13 - report_budget.php => reports/budget.php | 0 .../clients_with_balance.php | 0 .../credential_rotation.php | 0 .../expense_by_vendor.php | 0 .../expense_summary.php | 0 reports/includes/footer.php | 53 +++ reports/includes/header.php | 54 +++ reports/includes/inc_all_reports.php | 19 + reports/includes/modal_footer.php | 9 + reports/includes/modal_header.php | 13 + .../includes/side_nav.php | 30 +- .../income_by_client.php | 0 .../income_summary.php | 0 report_overview.php => reports/index.php | 0 .../profit_loss.php | 0 .../recurring_by_client.php | 0 .../tax_summary.php | 0 .../ticket_by_client.php | 0 .../ticket_summary.php | 0 .../tickets_unbilled.php | 0 .../time_by_tech.php | 0 user_activity.php => user/user_activity.php | 0 user_details.php => user/user_details.php | 0 .../user_preferences.php | 0 user_security.php => user/user_security.php | 0 178 files changed, 247 insertions(+), 882 deletions(-) rename admin_ai_model.php => admin/ai_model.php (100%) rename admin_ai_provider.php => admin/ai_provider.php (100%) rename admin_api.php => admin/api.php (100%) rename admin_app_log.php => admin/app_log.php (100%) rename admin_audit_log.php => admin/audit_log.php (100%) rename admin_backup.php => admin/backup.php (100%) rename admin_category.php => admin/category.php (100%) rename admin_custom_link.php => admin/custom_link.php (100%) rename admin_debug.php => admin/debug.php (100%) rename admin_document_template.php => admin/document_template.php (100%) rename admin_document_template_details.php => admin/document_template_details.php (100%) rename admin_identity_provider.php => admin/identity_provider.php (100%) create mode 100644 admin/index.php rename admin_mail_queue.php => admin/mail_queue.php (100%) rename admin_payment_method.php => admin/payment_method.php (100%) rename admin_payment_provider.php => admin/payment_provider.php (100%) create mode 100644 admin/post.php rename post/admin/admin_ai_model.php => admin/post/ai_model.php (100%) rename post/admin/admin_ai_provider.php => admin/post/ai_provider.php (100%) rename post/admin/admin_api.php => admin/post/api.php (100%) rename post/admin/admin_backup.php => admin/post/backup.php (100%) rename post/admin/admin_category.php => admin/post/category.php (100%) rename {post/user => admin/post}/category_model.php (100%) rename post/admin/admin_custom_field.php => admin/post/custom_field.php (100%) rename post/admin/admin_custom_field_model.php => admin/post/custom_field_model.php (100%) rename post/admin/admin_custom_link.php => admin/post/custom_link.php (100%) rename post/admin/admin_document_template.php => admin/post/document_template.php (100%) rename post/admin/admin_identity_provider.php => admin/post/identity_provider.php (100%) rename post/admin/admin_mail_queue.php => admin/post/mail_queue.php (100%) rename post/admin/admin_payment_method.php => admin/post/payment_method.php (100%) rename post/admin/admin_payment_provider.php => admin/post/payment_provider.php (100%) rename post/admin/admin_project_template.php => admin/post/project_template.php (100%) rename post/admin/admin_saved_payment_method.php => admin/post/saved_payment_method.php (100%) rename post/admin/admin_settings_ai.php => admin/post/settings_ai.php (100%) rename post/admin/admin_settings_company.php => admin/post/settings_company.php (100%) rename post/admin/admin_settings_default.php => admin/post/settings_default.php (100%) rename post/admin/admin_settings_invoice.php => admin/post/settings_invoice.php (100%) rename post/admin/admin_settings_localization.php => admin/post/settings_localization.php (100%) rename post/admin/admin_settings_mail.php => admin/post/settings_mail.php (100%) rename post/admin/admin_settings_module.php => admin/post/settings_module.php (100%) rename post/admin/admin_settings_notification.php => admin/post/settings_notification.php (100%) rename post/admin/admin_settings_online_payment.php => admin/post/settings_online_payment.php (100%) rename post/admin/admin_settings_online_payment_clients.php => admin/post/settings_online_payment_clients.php (100%) rename post/admin/admin_settings_project.php => admin/post/settings_project.php (100%) rename post/admin/admin_settings_quote.php => admin/post/settings_quote.php (100%) rename post/admin/admin_settings_security.php => admin/post/settings_security.php (100%) rename post/admin/admin_settings_telemetry.php => admin/post/settings_telemetry.php (100%) rename post/admin/admin_settings_theme.php => admin/post/settings_theme.php (100%) rename post/admin/admin_settings_ticket.php => admin/post/settings_ticket.php (100%) rename post/admin/admin_software_template.php => admin/post/software_template.php (100%) rename post/admin/admin_tag.php => admin/post/tag.php (100%) rename {post/user => admin/post}/tag_model.php (100%) rename post/admin/admin_tax.php => admin/post/tax.php (100%) rename post/admin/admin_ticket_status.php => admin/post/ticket_status.php (100%) rename post/admin/admin_ticket_template.php => admin/post/ticket_template.php (100%) rename post/admin/admin_update.php => admin/post/update.php (100%) rename admin/post/{user.php => users.php} (99%) rename post/admin/admin_vendor_template.php => admin/post/vendor_template.php (100%) rename admin_project_template.php => admin/project_template.php (100%) rename admin_project_template_details.php => admin/project_template_details.php (100%) rename admin_saved_payment_method.php => admin/saved_payment_method.php (100%) rename admin_settings_ai.php => admin/settings_ai.php (100%) rename admin_settings_company.php => admin/settings_company.php (100%) rename admin_settings_custom_fields.php => admin/settings_custom_fields.php (100%) rename admin_settings_default.php => admin/settings_default.php (100%) rename admin_settings_invoice.php => admin/settings_invoice.php (100%) rename admin_settings_localization.php => admin/settings_localization.php (100%) rename admin_settings_mail.php => admin/settings_mail.php (100%) rename admin_settings_module.php => admin/settings_module.php (100%) rename admin_settings_notification.php => admin/settings_notification.php (100%) rename admin_settings_online_payment.php => admin/settings_online_payment.php (100%) rename admin_settings_online_payment_clients.php => admin/settings_online_payment_clients.php (100%) rename admin_settings_project.php => admin/settings_project.php (100%) rename admin_settings_quote.php => admin/settings_quote.php (100%) rename admin_settings_security.php => admin/settings_security.php (100%) rename admin_settings_telemetry.php => admin/settings_telemetry.php (100%) rename admin_settings_theme.php => admin/settings_theme.php (100%) rename admin_settings_ticket.php => admin/settings_ticket.php (100%) rename admin_software_template.php => admin/software_template.php (100%) rename admin_tag.php => admin/tag.php (100%) rename admin_tax.php => admin/tax.php (100%) rename admin_ticket_status.php => admin/ticket_status.php (100%) rename admin_ticket_template.php => admin/ticket_template.php (100%) rename admin_ticket_template_details.php => admin/ticket_template_details.php (100%) rename admin_update.php => admin/update.php (100%) rename admin_vendor_template.php => admin/vendor_template.php (100%) delete mode 100644 includes/admin_side_nav.php delete mode 100644 includes/inc_all_admin.php delete mode 100644 includes/inc_all_reports.php rename post/{user => }/account.php (100%) delete mode 100644 post/admin/admin_role.php delete mode 100644 post/admin/admin_user.php delete mode 100644 post/admin/admin_user_model.php rename post/{user => }/asset.php (100%) rename post/{user => }/asset_interface_model.php (100%) rename post/{user => }/asset_model.php (100%) rename post/{user => }/budget.php (100%) rename post/{user => }/category.php (100%) rename post/{admin/admin_category_model.php => category_model.php} (100%) rename post/{user => }/certificate.php (100%) rename post/{user => }/certificate_model.php (100%) rename post/{user => }/client.php (100%) rename post/{user => }/client_model.php (100%) rename post/{user => }/contact.php (100%) rename post/{user => }/contact_model.php (100%) rename post/{user => }/credential.php (100%) rename post/{user => }/credential_model.php (100%) rename post/{user => }/credit.php (100%) rename post/{user => }/document.php (100%) rename post/{user => }/document_model.php (100%) rename post/{user => }/domain.php (100%) rename post/{user => }/domain_model.php (100%) rename post/{user => }/event.php (100%) rename post/{user => }/event_model.php (100%) rename post/{user => }/expense.php (100%) rename post/{user => }/expense_model.php (100%) rename post/{user => }/file.php (100%) rename post/{user => }/folder.php (100%) rename post/{user => }/invoice.php (100%) rename post/{user => }/invoice_model.php (100%) rename post/{user => }/location.php (100%) rename post/{user => }/location_model.php (100%) rename post/{user => }/network.php (100%) rename post/{user => }/network_model.php (100%) rename post/{user => }/product.php (100%) rename post/{user => }/product_model.php (100%) rename post/{user => }/profile.php (100%) rename post/{user => }/project.php (100%) rename post/{user => }/quote.php (100%) rename post/{user => }/quote_model.php (100%) rename post/{user => }/rack.php (100%) rename post/{user => }/revenue.php (100%) rename post/{user => }/service.php (100%) rename post/{user => }/software.php (100%) rename post/{user => }/tag.php (100%) rename post/{admin/admin_tag_model.php => tag_model.php} (100%) rename post/{user => }/task.php (100%) rename post/{user => }/ticket.php (100%) rename post/{user => }/ticket_recurring_model.php (100%) rename post/{user => }/transfer.php (100%) rename post/{user => }/transfer_model.php (100%) rename post/{user => }/trip.php (100%) rename post/{user => }/trip_model.php (100%) rename post/{user => }/vendor.php (100%) rename post/{user => }/vendor_contact.php (100%) rename post/{user => }/vendor_contact_model.php (100%) rename post/{user => }/vendor_model.php (100%) delete mode 100644 post/xcustom/readme.php rename report_budget.php => reports/budget.php (100%) rename report_clients_with_balance.php => reports/clients_with_balance.php (100%) rename report_credential_rotation.php => reports/credential_rotation.php (100%) rename report_expense_by_vendor.php => reports/expense_by_vendor.php (100%) rename report_expense_summary.php => reports/expense_summary.php (100%) create mode 100644 reports/includes/footer.php create mode 100644 reports/includes/header.php create mode 100644 reports/includes/inc_all_reports.php create mode 100644 reports/includes/modal_footer.php create mode 100644 reports/includes/modal_header.php rename includes/reports_side_nav.php => reports/includes/side_nav.php (62%) rename report_income_by_client.php => reports/income_by_client.php (100%) rename report_income_summary.php => reports/income_summary.php (100%) rename report_overview.php => reports/index.php (100%) rename report_profit_loss.php => reports/profit_loss.php (100%) rename report_recurring_by_client.php => reports/recurring_by_client.php (100%) rename report_tax_summary.php => reports/tax_summary.php (100%) rename report_ticket_by_client.php => reports/ticket_by_client.php (100%) rename report_ticket_summary.php => reports/ticket_summary.php (100%) rename report_tickets_unbilled.php => reports/tickets_unbilled.php (100%) rename report_time_by_tech.php => reports/time_by_tech.php (100%) rename user_activity.php => user/user_activity.php (100%) rename user_details.php => user/user_details.php (100%) rename user_preferences.php => user/user_preferences.php (100%) rename user_security.php => user/user_security.php (100%) diff --git a/admin_ai_model.php b/admin/ai_model.php similarity index 100% rename from admin_ai_model.php rename to admin/ai_model.php diff --git a/admin_ai_provider.php b/admin/ai_provider.php similarity index 100% rename from admin_ai_provider.php rename to admin/ai_provider.php diff --git a/admin_api.php b/admin/api.php similarity index 100% rename from admin_api.php rename to admin/api.php diff --git a/admin_app_log.php b/admin/app_log.php similarity index 100% rename from admin_app_log.php rename to admin/app_log.php diff --git a/admin_audit_log.php b/admin/audit_log.php similarity index 100% rename from admin_audit_log.php rename to admin/audit_log.php diff --git a/admin_backup.php b/admin/backup.php similarity index 100% rename from admin_backup.php rename to admin/backup.php diff --git a/admin_category.php b/admin/category.php similarity index 100% rename from admin_category.php rename to admin/category.php diff --git a/admin_custom_link.php b/admin/custom_link.php similarity index 100% rename from admin_custom_link.php rename to admin/custom_link.php diff --git a/admin_debug.php b/admin/debug.php similarity index 100% rename from admin_debug.php rename to admin/debug.php diff --git a/admin_document_template.php b/admin/document_template.php similarity index 100% rename from admin_document_template.php rename to admin/document_template.php diff --git a/admin_document_template_details.php b/admin/document_template_details.php similarity index 100% rename from admin_document_template_details.php rename to admin/document_template_details.php diff --git a/admin_identity_provider.php b/admin/identity_provider.php similarity index 100% rename from admin_identity_provider.php rename to admin/identity_provider.php diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php index 23e8af1a..fe134d33 100644 --- a/admin/includes/side_nav.php +++ b/admin/includes/side_nav.php @@ -1,6 +1,6 @@
    -
    +
    diff --git a/admin_payment_method.php b/admin/payment_method.php similarity index 100% rename from admin_payment_method.php rename to admin/payment_method.php diff --git a/admin_payment_provider.php b/admin/payment_provider.php similarity index 100% rename from admin_payment_provider.php rename to admin/payment_provider.php diff --git a/admin/post.php b/admin/post.php new file mode 100644 index 00000000..d845b57f --- /dev/null +++ b/admin/post.php @@ -0,0 +1,33 @@ + - diff --git a/includes/inc_all_admin.php b/includes/inc_all_admin.php deleted file mode 100644 index 80aabe2d..00000000 --- a/includes/inc_all_admin.php +++ /dev/null @@ -1,16 +0,0 @@ -Tell your admin: Your role does not have admin access."); -} -require_once "header.php"; -require_once "top_nav.php"; -require_once "admin_side_nav.php"; -require_once "inc_wrapper.php"; -require_once "inc_alert_feedback.php"; -require_once "filter_header.php"; -require_once "app_version.php"; diff --git a/includes/inc_all_reports.php b/includes/inc_all_reports.php deleted file mode 100644 index 37354007..00000000 --- a/includes/inc_all_reports.php +++ /dev/null @@ -1,19 +0,0 @@ -= 1) { ?>
  • - +

    Reports

    diff --git a/includes/top_nav.php b/includes/top_nav.php index 730e9d60..7445610a 100644 --- a/includes/top_nav.php +++ b/includes/top_nav.php @@ -105,7 +105,7 @@
  • - Administration + Administration Account Logout diff --git a/post/user/account.php b/post/account.php similarity index 100% rename from post/user/account.php rename to post/account.php diff --git a/post/admin/admin_role.php b/post/admin/admin_role.php deleted file mode 100644 index af659e70..00000000 --- a/post/admin/admin_role.php +++ /dev/null @@ -1,89 +0,0 @@ - created"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['edit_role'])) { - - validateCSRFToken($_POST['csrf_token']); - - // Update role metadata - $role_id = sanitizeInput($_POST['role_id']); - $name = sanitizeInput($_POST['role_name']); - $description = sanitizeInput($_POST['role_description']); - $admin = intval($_POST['role_is_admin']); - - mysqli_query($mysqli, "UPDATE user_roles SET role_name = '$name', role_description = '$description', role_is_admin = $admin WHERE role_id = $role_id"); - - // Update role access levels - mysqli_query($mysqli, "DELETE FROM user_role_permissions WHERE user_role_id = $role_id"); - foreach ($_POST as $key => $value) { - if (str_contains($key, '##module_')){ - $module_id = intval(explode('##', $key)[0]); - $access_level = intval($value); - - if ($access_level > 0) { - mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = $role_id, module_id = $module_id, user_role_permission_level = $access_level"); - } - } - - } - - // Logging - logAction("User Role", "Edit", "$session_name edited user role $name", 0, $role_id); - - $_SESSION['alert_message'] = "User Role $name edited"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); -} - -if (isset($_GET['archive_role'])) { - - validateCSRFToken($_GET['csrf_token']); - - $role_id = intval($_GET['archive_role']); - - // Check role isn't in use - $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(user_id) FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL"); - $role_user_count = mysqli_fetch_row($sql_role_user_count)[0]; - if ($role_user_count != 0) { - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Role must not in use to archive it"; - header("Location: " . $_SERVER["HTTP_REFERER"]); - exit(); - } - - mysqli_query($mysqli, "UPDATE user_roles SET role_archived_at = NOW() WHERE role_id = $role_id"); - - // Logging - $role_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT role_name FROM user_roles WHERE role_id = $role_id LIMIT 1")); - $role_name = sanitizeInput($role_details['role_name']); - logAction("User Role", "Archive", "$session_name archived user role $role_name", 0, $role_id); - - $_SESSION['alert_message'] = "User Role archived"; - header("Location: " . $_SERVER["HTTP_REFERER"]); -} \ No newline at end of file diff --git a/post/admin/admin_user.php b/post/admin/admin_user.php deleted file mode 100644 index 862e4ea4..00000000 --- a/post/admin/admin_user.php +++ /dev/null @@ -1,371 +0,0 @@ -
    An ITFlow account has been setup for you. Please change your password upon login.

    Username: $email
    Password: $password
    Login URL: https://$config_base_url/login.php?key=$config_login_key_secret

    --
    $company_name - Support
    $config_ticket_from_email"; - - $data = [ - [ - 'from' => $config_mail_from_email, - 'from_name' => $config_mail_from_name, - 'recipient' => $email, - 'recipient_name' => $name, - 'subject' => $subject, - 'body' => $body - ] - ]; - $mail = addToMailQueue($data); - - if ($mail !== true) { - mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email'"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email regarding $subject. $mail', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $user_id"); - } - - } - - // Logging - logAction("User", "Create", "$session_name created user $name", 0, $user_id); - - $_SESSION['alert_message'] = "User $name created" . $extended_alert_description; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['edit_user'])) { - - validateCSRFToken($_POST['csrf_token']); - - require_once 'post/admin/admin_user_model.php'; - - $user_id = intval($_POST['user_id']); - $new_password = trim($_POST['new_password']); - - // Update Client Access - mysqli_query($mysqli,"DELETE FROM user_client_permissions WHERE user_id = $user_id"); - if (isset($_POST['clients'])) { - foreach($_POST['clients'] as $client_id) { - $client_id = intval($client_id); - mysqli_query($mysqli,"INSERT INTO user_client_permissions SET user_id = $user_id, client_id = $client_id"); - } - } - - // Get current Avatar - $sql = mysqli_query($mysqli, "SELECT user_avatar FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); - $existing_file_name = sanitizeInput($row['user_avatar']); - - $extended_log_description = ''; - if (!empty($_POST['2fa'])) { - $two_fa = $_POST['2fa']; - } - - if (!file_exists("uploads/users/$user_id/")) { - mkdir("uploads/users/$user_id"); - } - - // Check for and process image/photo - $extended_alert_description = ''; - if (isset($_FILES['file']['tmp_name'])) { - if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) { - - $file_tmp_path = $_FILES['file']['tmp_name']; - - // directory in which the uploaded file will be moved - $upload_file_dir = "uploads/users/$user_id/"; - $dest_path = $upload_file_dir . $new_file_name; - move_uploaded_file($file_tmp_path, $dest_path); - - // Delete old file - unlink("uploads/users/$user_id/$existing_file_name"); - - // Set Avatar - mysqli_query($mysqli, "UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id"); - $extended_alert_description = '. File successfully uploaded.'; - - } - } - - mysqli_query($mysqli, "UPDATE users SET user_name = '$name', user_email = '$email', user_role_id = $role WHERE user_id = $user_id"); - - if (!empty($new_password)) { - $new_password = password_hash($new_password, PASSWORD_DEFAULT); - $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($_POST['new_password'])); - mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id"); - //Extended Logging - $extended_log_description .= ", password changed"; - } - - if (!empty($two_fa) && $two_fa == 'disable') { - mysqli_query($mysqli, "UPDATE users SET user_token = '' WHERE user_id = '$user_id'"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name disabled 2FA for $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); - } - - //Update User Settings - mysqli_query($mysqli, "UPDATE user_settings SET user_config_force_mfa = $force_mfa WHERE user_id = $user_id"); - - // Logging - logAction("User", "Edit", "$session_name edited user $name", 0, $user_id); - - $_SESSION['alert_message'] = "User $name updated" . $extended_alert_description; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['activate_user'])) { - - validateCSRFToken($_GET['csrf_token']); - - $user_id = intval($_GET['activate_user']); - - // Get User Name - $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); - $user_name = sanitizeInput($row['user_name']); - - mysqli_query($mysqli, "UPDATE users SET user_status = 1 WHERE user_id = $user_id"); - - // Logging - logAction("User", "Activate", "$session_name activated user $user_name", 0, $user_id); - - $_SESSION['alert_message'] = "User $user_name activated"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['disable_user'])) { - - validateCSRFToken($_GET['csrf_token']); - - $user_id = intval($_GET['disable_user']); - - // Get User Name - $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); - $user_name = sanitizeInput($row['user_name']); - - mysqli_query($mysqli, "UPDATE users SET user_status = 0 WHERE user_id = $user_id"); - - // Un-assign tickets - mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = 0 WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL"); - mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_assigned_to = 0 WHERE recurring_ticket_assigned_to = $user_id"); - - // Logging - logAction("User", "Disable", "$session_name disabled user $name", 0, $user_id); - - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "User $user_name disabled"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['revoke_remember_me'])) { - - validateCSRFToken($_GET['csrf_token']); - - $user_id = intval($_GET['revoke_remember_me']); - - // Get User Name - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id")); - $user_name = sanitizeInput($row['user_name']); - - mysqli_query($mysqli, "DELETE FROM remember_tokens WHERE remember_token_user_id = $user_id"); - - // Logging - logAction("User", "Edit", "$session_name revoked all remember me tokens for user $user_name", 0, $user_id); - - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "User $user_name remember me tokens revoked"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_GET['archive_user'])) { - - validateCSRFToken($_GET['csrf_token']); - - // Variables from GET - $user_id = intval($_GET['archive_user']); - $password = password_hash(randomString(), PASSWORD_DEFAULT); - - // Get user details - $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); - $name = sanitizeInput($row['user_name']); - - // Archive user query - mysqli_query($mysqli, "UPDATE users SET user_name = '$name (archived)', user_password = '$password', user_status = 0, user_specific_encryption_ciphertext = '', user_archived_at = NOW() WHERE user_id = $user_id"); - - // Logging - logAction("User", "Archive", "$session_name archived user $name", 0, $user_id); - - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "User $name archived"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['export_users_csv'])) { - - //get records from database - $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_roles ON user_role_id = role_id ORDER BY user_name ASC"); - - $count = mysqli_num_rows($sql); - - if ($count > 0) { - $delimiter = ","; - $filename = "Users-" . date('Y-m-d') . ".csv"; - - //create a file pointer - $f = fopen('php://memory', 'w'); - - //set column headers - $fields = array('Name', 'Email', 'Role', 'Status', 'Creation Date'); - fputcsv($f, $fields, $delimiter); - - //output each row of the data, format line as csv and write to file pointer - while($row = $sql->fetch_assoc()) { - - $user_status = intval($row['user_status']); - if ($user_status == 2) { - $user_status_display = "Invited"; - } elseif ($user_status == 1) { - $user_status_display = "Active"; - } else{ - $user_status_display = "Disabled"; - } - - $lineData = array($row['user_name'], $row['user_email'], $row['role_name'], $user_status_display, $row['user_created_at']); - fputcsv($f, $lineData, $delimiter); - } - - //move back to beginning of file - fseek($f, 0); - - //set headers to download file rather than displayed - header('Content-Type: text/csv'); - header('Content-Disposition: attachment; filename="' . $filename . '";'); - - //output all remaining data on a file pointer - fpassthru($f); - - // Logging - logAction("User", "Export", "$session_name exported $count user(s) to a CSV file"); - } - exit; - -} - -if (isset($_POST['ir_reset_user_password'])) { - - // Incident response: allow mass reset of agent passwords - - validateCSRFToken($_POST['csrf_token']); - - // Confirm logged-in user password, for security - $admin_password = $_POST['admin_password']; - $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $session_user_id"); - $userRow = mysqli_fetch_array($sql); - if (!password_verify($admin_password, $userRow['user_password'])) { - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Incorrect password."; - header("Location: " . $_SERVER["HTTP_REFERER"]); - exit; - } - - // Get agents/users, other than the current user - $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE (user_archived_at IS NULL AND user_id != $session_user_id)"); - - // Reset passwords - while ($row = mysqli_fetch_array($sql_users)) { - $user_id = intval($row['user_id']); - $user_email = sanitizeInput($row['user_email']); - $new_password = randomString(); - $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($new_password)); - - echo $user_email . " -- " . $new_password; // Show - $new_password = password_hash($new_password, PASSWORD_DEFAULT); - - mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id"); - - echo "

    "; - } - - // Logging - logAction("User", "Edit", "$session_name reset ALL user passwords"); - - exit; // Stay on the plain text password page - -} diff --git a/post/admin/admin_user_model.php b/post/admin/admin_user_model.php deleted file mode 100644 index 4652af8a..00000000 --- a/post/admin/admin_user_model.php +++ /dev/null @@ -1,7 +0,0 @@ - + + +

    ITFlow   ·   Docs   ·   Forum   ·   Services

    +
    + + +
    • +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/reports/includes/header.php b/reports/includes/header.php new file mode 100644 index 00000000..8a22fd82 --- /dev/null +++ b/reports/includes/header.php @@ -0,0 +1,54 @@ + + + + + + + + + + + <?php echo $session_company_name; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"> +
    diff --git a/reports/includes/inc_all_reports.php b/reports/includes/inc_all_reports.php new file mode 100644 index 00000000..d04ede47 --- /dev/null +++ b/reports/includes/inc_all_reports.php @@ -0,0 +1,19 @@ + + + + $content]); +?> \ No newline at end of file diff --git a/reports/includes/modal_header.php b/reports/includes/modal_header.php new file mode 100644 index 00000000..695f098a --- /dev/null +++ b/reports/includes/modal_header.php @@ -0,0 +1,13 @@ + 'ID missing.']); +// exit; +//} diff --git a/includes/reports_side_nav.php b/reports/includes/side_nav.php similarity index 62% rename from includes/reports_side_nav.php rename to reports/includes/side_nav.php index 4eb5c72d..21de1cf7 100644 --- a/includes/reports_side_nav.php +++ b/reports/includes/side_nav.php @@ -1,7 +1,7 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/db.sql b/setup/db.sql similarity index 100% rename from db.sql rename to setup/db.sql diff --git a/setup.php b/setup/index.php similarity index 100% rename from setup.php rename to setup/index.php diff --git a/accounts.php b/user/accounts.php similarity index 98% rename from accounts.php rename to user/accounts.php index d1b2aecc..16ca6995 100644 --- a/accounts.php +++ b/user/accounts.php @@ -124,11 +124,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    0) { - +
    @@ -742,4 +742,4 @@ require_once "modals/asset_export_modal.php"; if ($client_url) { require_once "modals/asset_import_modal.php"; } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/blank.php b/user/blank.php similarity index 98% rename from blank.php rename to user/blank.php index 2a313940..30e47834 100644 --- a/blank.php +++ b/user/blank.php @@ -69,4 +69,4 @@ echo "Current Date and Time: $date_time"; - diff --git a/budget_edit.php b/user/budget_edit.php similarity index 99% rename from budget_edit.php rename to user/budget_edit.php index c4b09abc..26af60ce 100644 --- a/budget_edit.php +++ b/user/budget_edit.php @@ -110,5 +110,5 @@ function getBudgetAmount($budgets, $categoryId, $month) { return 0; } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/calendar.php b/user/calendar.php similarity index 99% rename from calendar.php rename to user/calendar.php index 64f1ac95..1f0fd9d4 100644 --- a/calendar.php +++ b/user/calendar.php @@ -106,7 +106,7 @@ while ($row = mysqli_fetch_array($sql)) { ?> - diff --git a/certificates.php b/user/certificates.php similarity index 99% rename from certificates.php rename to user/certificates.php index b72c1768..d765d3c7 100644 --- a/certificates.php +++ b/user/certificates.php @@ -303,7 +303,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -316,4 +316,4 @@ require_once "modals/certificate_export_modal.php"; - 0) {
    -
    @@ -494,4 +494,4 @@ while ($folder_id > 0) { require_once "modals/share_modal.php"; require_once "modals/client_document_add_modal.php"; require_once "modals/client_document_add_from_template_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/client_files.php b/user/client_files.php similarity index 99% rename from client_files.php rename to user/client_files.php index 04a58e85..cc83e8ba 100644 --- a/client_files.php +++ b/user/client_files.php @@ -601,7 +601,7 @@ while ($folder_id > 0) { -
    @@ -638,4 +638,4 @@ function prevFile() { require_once "modals/client_file_upload_modal.php"; require_once "modals/share_modal.php"; require_once "modals/client_file_delete_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/client_overview.php b/user/client_overview.php similarity index 99% rename from client_overview.php rename to user/client_overview.php index 4a1c02ba..aa41e9a9 100644 --- a/client_overview.php +++ b/user/client_overview.php @@ -699,5 +699,5 @@ $sql_asset_retired = mysqli_query( - +
    @@ -631,4 +631,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/clients/client_add.php"; require_once "modals/clients/client_import.php"; require_once "modals/clients/client_export.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/contact_details.php b/user/contact_details.php similarity index 99% rename from contact_details.php rename to user/contact_details.php index 0f7f06be..3dccc2b7 100644 --- a/contact_details.php +++ b/user/contact_details.php @@ -1217,4 +1217,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 "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/contacts.php b/user/contacts.php similarity index 99% rename from contacts.php rename to user/contacts.php index e918d0c3..b77d779b 100644 --- a/contacts.php +++ b/user/contacts.php @@ -560,7 +560,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
    @@ -612,4 +612,4 @@ if ($client_url) { require_once "modals/contact_invite_modal.php"; require_once "modals/contact_import_modal.php"; } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/credentials.php b/user/credentials.php similarity index 99% rename from credentials.php rename to user/credentials.php index 818fe579..4c81bd96 100644 --- a/credentials.php +++ b/user/credentials.php @@ -528,7 +528,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -547,4 +547,4 @@ require_once "modals/credential_export_modal.php"; if ($client_url) { require_once "modals/credential_import_modal.php"; } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/dashboard.php b/user/dashboard.php similarity index 99% rename from dashboard.php rename to user/dashboard.php index d3575f17..2b9ceaad 100644 --- a/dashboard.php +++ b/user/dashboard.php @@ -734,7 +734,7 @@ if ($user_config_dashboard_technical_enable == 1) { - + diff --git a/database_updates.php b/user/database_updates.php similarity index 100% rename from database_updates.php rename to user/database_updates.php diff --git a/domains.php b/user/domains.php similarity index 99% rename from domains.php rename to user/domains.php index fd39c9b3..68b0f9ad 100644 --- a/domains.php +++ b/user/domains.php @@ -365,7 +365,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -377,5 +377,5 @@ require_once "modals/domain_export_modal.php"; - -
    @@ -386,4 +386,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/expense_add_modal.php"; require_once "modals/expense_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/global_search.php b/user/global_search.php similarity index 99% rename from global_search.php rename to user/global_search.php index f5f8e765..ca21e3b3 100644 --- a/global_search.php +++ b/user/global_search.php @@ -853,7 +853,7 @@ if (isset($_GET['query'])) { } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/reports/includes/inc_all_reports.php b/user/includes/inc_all.php similarity index 64% rename from reports/includes/inc_all_reports.php rename to user/includes/inc_all.php index d04ede47..6d3af058 100644 --- a/reports/includes/inc_all_reports.php +++ b/user/includes/inc_all.php @@ -4,16 +4,10 @@ require_once "../config.php"; require_once "../functions.php"; require_once "../includes/check_login.php"; require_once "../includes/page_title.php"; -// Reporting Perms -enforceUserPermission('module_reporting'); -require_once "includes/header.php"; +require_once "../includes/header.php"; require_once "../includes/top_nav.php"; +require_once "../includes/get_side_nav_counts.php"; require_once "includes/side_nav.php"; require_once "../includes/inc_wrapper.php"; require_once "../includes/inc_alert_feedback.php"; require_once "../includes/filter_header.php"; - -// Set variable default values -$largest_income_month = 0; -$largest_invoice_month = 0; -$recurring_total = 0; diff --git a/user/includes/inc_all_client.php b/user/includes/inc_all_client.php new file mode 100644 index 00000000..40cccea6 --- /dev/null +++ b/user/includes/inc_all_client.php @@ -0,0 +1,316 @@ +window.history.back();"; + exit(); + } + + $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id"); + + $sql = mysqli_query( + $mysqli, + "SELECT * FROM clients + LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE client_id = $client_id" + ); + + if (mysqli_num_rows($sql) == 0) { + require_once "header.php"; + + echo "

    Nothing to see here

    "; + } else { + + $row = mysqli_fetch_array($sql); + $client_name = nullable_htmlentities($row['client_name']); + $client_is_lead = intval($row['client_lead']); + $client_type = nullable_htmlentities($row['client_type']); + $client_website = nullable_htmlentities($row['client_website']); + $client_referral = nullable_htmlentities($row['client_referral']); + $client_currency_code = nullable_htmlentities($row['client_currency_code']); + $client_net_terms = intval($row['client_net_terms']); + if ($client_net_terms == 0) { + $client_net_terms = $config_default_net_terms; + } + $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); + $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); + $client_rate = floatval($row['client_rate']); + $client_notes = nullable_htmlentities($row['client_notes']); + $client_created_at = nullable_htmlentities($row['client_created_at']); + $client_archived_at = nullable_htmlentities($row['client_archived_at']); + $contact_id = intval($row['contact_id']); + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_title = nullable_htmlentities($row['contact_title']); + $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)); + $contact_extension = nullable_htmlentities($row['contact_extension']); + $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); + $contact_primary = intval($row['contact_primary']); + $location_id = intval($row['location_id']); + $location_name = nullable_htmlentities($row['location_name']); + $location_address = nullable_htmlentities($row['location_address']); + $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']); + $location_phone_country_code = nullable_htmlentities($row['location_phone_country_code']); + $location_phone = nullable_htmlentities(formatPhoneNumber($row['location_phone'], $location_phone_country_code)); + $location_primary = intval($row['location_primary']); + + // Tab Title // No Sanitizing needed + $tab_title = $row['client_name']; + + // Client Tags + + $client_tag_name_display_array = array(); + $client_tag_id_array = array(); + $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_client_tags)) { + + $client_tag_id = intval($row['tag_id']); + $client_tag_name = nullable_htmlentities($row['tag_name']); + $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } + $client_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($client_tag_icon)) { + $client_tag_icon = "tag"; + } + + $client_tag_id_array[] = $client_tag_id; + $client_tag_name_display_array[] = "$client_tag_name"; + } + $client_tags_display = implode('', $client_tag_name_display_array); + + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'"); + $row = mysqli_fetch_array($sql_invoice_amounts); + + $invoice_amounts = floatval($row['invoice_amounts']); + + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_amount_paid); + + $amount_paid = floatval($row['amount_paid']); + + $balance = $invoice_amounts - $amount_paid; + + //Get Monthly Recurring Total + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_monthly_total); + + $recurring_monthly_total = floatval($row['recurring_monthly_total']); + + //Get Yearly Recurring Total + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_recurring_yearly_total); + + $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; + + $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; + + // Get Credit Balance + $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credit_balance); + + $credit_balance = floatval($row['credit_balance']); + + // Badge Counts + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); + $num_contacts = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id")); + $num_locations = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id")); + $num_assets = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4 AND ticket_client_id = $client_id")); + $num_active_tickets = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NOT NULL AND ticket_client_id = $client_id")); + $num_closed_tickets = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id")); + $num_recurring_tickets = $row['num']; + + // Active Project Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL AND project_client_id = $client_id")); + $num_active_projects = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); + $num_services = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id")); + $num_vendors = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id")); + $num_credentials = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id")); + $num_networks = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('rack_id') AS num FROM racks WHERE rack_archived_at IS NULL AND rack_client_id = $client_id")); + $num_racks = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id")); + $num_domains = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id")); + $num_certificates = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id")); + $num_software = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_open = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_draft = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_sent = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_viewed = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_partial = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices_paid = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id")); + $num_invoices = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id")); + $num_quotes = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL AND recurring_invoice_client_id = $client_id")); + $num_recurring_invoices = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id")); + $num_payments = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id")); + $num_files = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); + $num_documents = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); + $num_calendar_events = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); + $num_trips = $row['num']; + + // Expiring Items + + // Count Domains Expiring within 45 Days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('domain_id') AS num FROM domains + WHERE domain_client_id = $client_id + AND domain_expire IS NOT NULL + AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY + AND domain_archived_at IS NULL" + )); + $num_domains_expiring_warning= intval($row['num']); + + // Count Domains Expired or within 7 days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('domain_id') AS num FROM domains + WHERE domain_client_id = $client_id + AND domain_expire IS NOT NULL + AND ( + domain_expire < CURRENT_DATE + OR domain_expire < CURRENT_DATE + INTERVAL 7 DAY + ) + AND domain_archived_at IS NULL" + )); + $num_domains_urgent = intval($row['num']); + + // Count Certificates Expiring within 7 Days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('certificate_id') AS num FROM certificates + WHERE certificate_client_id = $client_id + AND certificate_expire IS NOT NULL + AND certificate_expire < CURRENT_DATE + INTERVAL 7 DAY + AND certificate_archived_at IS NULL" + )); + $num_certificates_expiring = intval($row['num']); + + // Count Certificates Expired or within 7 days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('certificate_id') AS num FROM certificates + WHERE certificate_client_id = $client_id + AND certificate_expire IS NOT NULL + AND ( + certificate_expire < CURRENT_DATE + OR certificate_expire < CURRENT_DATE + INTERVAL 1 DAY + ) + AND certificate_archived_at IS NULL" + )); + $num_certificates_expired = intval($row['num']); + + // Count Software Expiring within 90 Days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('software_id') AS num FROM software + WHERE software_client_id = $client_id + AND software_expire IS NOT NULL + AND software_expire < CURRENT_DATE + INTERVAL 45 DAY + AND software_archived_at IS NULL" + )); + $num_software_expiring = intval($row['num']); + + // Count Software Expired or within 14 days + $row = mysqli_fetch_assoc(mysqli_query( + $mysqli, + "SELECT COUNT('software_id') AS num FROM software + WHERE software_client_id = $client_id + AND software_expire IS NOT NULL + AND ( + software_expire < CURRENT_DATE + OR software_expire < CURRENT_DATE + INTERVAL 7 DAY + ) + AND software_archived_at IS NULL" + )); + $num_software_expired = intval($row['num']); + + } +} + +require_once "header.php"; +require_once "top_nav.php"; +require_once "client_side_nav.php"; +require_once "inc_wrapper.php"; +require_once "inc_alert_feedback.php"; +require_once "inc_client_top_head.php"; +require_once "filter_header.php"; diff --git a/user/includes/inc_all_user.php b/user/includes/inc_all_user.php new file mode 100644 index 00000000..bafda7b6 --- /dev/null +++ b/user/includes/inc_all_user.php @@ -0,0 +1,12 @@ + + +
      +
    1. + Dashboard +
      2. +
    2. Blank Page
      3. +
    + + +

    Blank Page

    +
    + + + \ No newline at end of file diff --git a/invoice.php b/user/invoice.php similarity index 99% rename from invoice.php rename to user/invoice.php index df211cd6..705a65bc 100644 --- a/invoice.php +++ b/user/invoice.php @@ -32,7 +32,7 @@ if (isset($_GET['invoice_id'])) { $backlink_append = ''; } echo "

    There is no Invoice here
    Back to Invoices

    "; - require_once "includes/footer.php"; + require_once "../includes/footer.php"; exit(); } @@ -759,7 +759,7 @@ if (isset($_GET['invoice_id'])) { } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/invoices.php b/user/invoices.php similarity index 99% rename from invoices.php rename to user/invoices.php index 3f9c0584..c292b078 100644 --- a/invoices.php +++ b/user/invoices.php @@ -454,7 +454,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -465,4 +465,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/invoice_add_modal.php"; if ($client_url) { require_once "modals/invoice_payment_add_bulk_modal.php"; } require_once "modals/invoice_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/locations.php b/user/locations.php similarity index 99% rename from locations.php rename to user/locations.php index abd4e6e0..0fbc1f55 100644 --- a/locations.php +++ b/user/locations.php @@ -403,7 +403,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -415,4 +415,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/location_add_modal.php"; require_once "modals/location_import_modal.php"; require_once "modals/location_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/mfa_enforcement.php b/user/mfa_enforcement.php similarity index 100% rename from mfa_enforcement.php rename to user/mfa_enforcement.php diff --git a/modals/account_add_modal.php b/user/modals/account_add_modal.php similarity index 100% rename from modals/account_add_modal.php rename to user/modals/account_add_modal.php diff --git a/modals/asset_add_modal.php b/user/modals/asset_add_modal.php similarity index 100% rename from modals/asset_add_modal.php rename to user/modals/asset_add_modal.php diff --git a/modals/asset_bulk_add_ticket_modal.php b/user/modals/asset_bulk_add_ticket_modal.php similarity index 100% rename from modals/asset_bulk_add_ticket_modal.php rename to user/modals/asset_bulk_add_ticket_modal.php diff --git a/modals/asset_bulk_assign_contact_modal.php b/user/modals/asset_bulk_assign_contact_modal.php similarity index 100% rename from modals/asset_bulk_assign_contact_modal.php rename to user/modals/asset_bulk_assign_contact_modal.php diff --git a/modals/asset_bulk_assign_location_modal.php b/user/modals/asset_bulk_assign_location_modal.php similarity index 100% rename from modals/asset_bulk_assign_location_modal.php rename to user/modals/asset_bulk_assign_location_modal.php diff --git a/modals/asset_bulk_assign_physical_location_modal.php b/user/modals/asset_bulk_assign_physical_location_modal.php similarity index 100% rename from modals/asset_bulk_assign_physical_location_modal.php rename to user/modals/asset_bulk_assign_physical_location_modal.php diff --git a/modals/asset_bulk_edit_status_modal.php b/user/modals/asset_bulk_edit_status_modal.php similarity index 100% rename from modals/asset_bulk_edit_status_modal.php rename to user/modals/asset_bulk_edit_status_modal.php diff --git a/modals/asset_bulk_transfer_client_modal.php b/user/modals/asset_bulk_transfer_client_modal.php similarity index 100% rename from modals/asset_bulk_transfer_client_modal.php rename to user/modals/asset_bulk_transfer_client_modal.php diff --git a/modals/asset_export_modal.php b/user/modals/asset_export_modal.php similarity index 100% rename from modals/asset_export_modal.php rename to user/modals/asset_export_modal.php diff --git a/modals/asset_import_modal.php b/user/modals/asset_import_modal.php similarity index 100% rename from modals/asset_import_modal.php rename to user/modals/asset_import_modal.php diff --git a/modals/asset_interface_add_modal.php b/user/modals/asset_interface_add_modal.php similarity index 100% rename from modals/asset_interface_add_modal.php rename to user/modals/asset_interface_add_modal.php diff --git a/modals/asset_interface_bulk_edit_network_modal.php b/user/modals/asset_interface_bulk_edit_network_modal.php similarity index 100% rename from modals/asset_interface_bulk_edit_network_modal.php rename to user/modals/asset_interface_bulk_edit_network_modal.php diff --git a/modals/asset_interface_bulk_edit_type_modal.php b/user/modals/asset_interface_bulk_edit_type_modal.php similarity index 100% rename from modals/asset_interface_bulk_edit_type_modal.php rename to user/modals/asset_interface_bulk_edit_type_modal.php diff --git a/modals/asset_interface_export_modal.php b/user/modals/asset_interface_export_modal.php similarity index 100% rename from modals/asset_interface_export_modal.php rename to user/modals/asset_interface_export_modal.php diff --git a/modals/asset_interface_import_modal.php b/user/modals/asset_interface_import_modal.php similarity index 100% rename from modals/asset_interface_import_modal.php rename to user/modals/asset_interface_import_modal.php diff --git a/modals/asset_interface_multiple_add_modal.php b/user/modals/asset_interface_multiple_add_modal.php similarity index 100% rename from modals/asset_interface_multiple_add_modal.php rename to user/modals/asset_interface_multiple_add_modal.php diff --git a/modals/budget_create_modal.php b/user/modals/budget_create_modal.php similarity index 100% rename from modals/budget_create_modal.php rename to user/modals/budget_create_modal.php diff --git a/modals/budget_edit_modal.php b/user/modals/budget_edit_modal.php similarity index 100% rename from modals/budget_edit_modal.php rename to user/modals/budget_edit_modal.php diff --git a/modals/calendar_add_modal.php b/user/modals/calendar_add_modal.php similarity index 100% rename from modals/calendar_add_modal.php rename to user/modals/calendar_add_modal.php diff --git a/modals/calendar_event_add_modal.php b/user/modals/calendar_event_add_modal.php similarity index 100% rename from modals/calendar_event_add_modal.php rename to user/modals/calendar_event_add_modal.php diff --git a/modals/certificate_add_modal.php b/user/modals/certificate_add_modal.php similarity index 100% rename from modals/certificate_add_modal.php rename to user/modals/certificate_add_modal.php diff --git a/modals/certificate_export_modal.php b/user/modals/certificate_export_modal.php similarity index 100% rename from modals/certificate_export_modal.php rename to user/modals/certificate_export_modal.php diff --git a/modals/client_asset_documents_modal.php b/user/modals/client_asset_documents_modal.php similarity index 100% rename from modals/client_asset_documents_modal.php rename to user/modals/client_asset_documents_modal.php diff --git a/modals/client_document_add_file_relation_modal.php b/user/modals/client_document_add_file_relation_modal.php similarity index 100% rename from modals/client_document_add_file_relation_modal.php rename to user/modals/client_document_add_file_relation_modal.php diff --git a/modals/client_document_add_from_template_modal.php b/user/modals/client_document_add_from_template_modal.php similarity index 100% rename from modals/client_document_add_from_template_modal.php rename to user/modals/client_document_add_from_template_modal.php diff --git a/modals/client_document_add_modal.php b/user/modals/client_document_add_modal.php similarity index 100% rename from modals/client_document_add_modal.php rename to user/modals/client_document_add_modal.php diff --git a/modals/client_document_bulk_move_modal.php b/user/modals/client_document_bulk_move_modal.php similarity index 100% rename from modals/client_document_bulk_move_modal.php rename to user/modals/client_document_bulk_move_modal.php diff --git a/modals/client_document_link_asset_modal.php b/user/modals/client_document_link_asset_modal.php similarity index 100% rename from modals/client_document_link_asset_modal.php rename to user/modals/client_document_link_asset_modal.php diff --git a/modals/client_document_link_contact_modal.php b/user/modals/client_document_link_contact_modal.php similarity index 100% rename from modals/client_document_link_contact_modal.php rename to user/modals/client_document_link_contact_modal.php diff --git a/modals/client_document_link_file_modal.php b/user/modals/client_document_link_file_modal.php similarity index 100% rename from modals/client_document_link_file_modal.php rename to user/modals/client_document_link_file_modal.php diff --git a/modals/client_document_link_software_modal.php b/user/modals/client_document_link_software_modal.php similarity index 100% rename from modals/client_document_link_software_modal.php rename to user/modals/client_document_link_software_modal.php diff --git a/modals/client_document_link_vendor_modal.php b/user/modals/client_document_link_vendor_modal.php similarity index 100% rename from modals/client_document_link_vendor_modal.php rename to user/modals/client_document_link_vendor_modal.php diff --git a/modals/client_file_bulk_move_modal.php b/user/modals/client_file_bulk_move_modal.php similarity index 100% rename from modals/client_file_bulk_move_modal.php rename to user/modals/client_file_bulk_move_modal.php diff --git a/modals/client_file_delete_modal.php b/user/modals/client_file_delete_modal.php similarity index 100% rename from modals/client_file_delete_modal.php rename to user/modals/client_file_delete_modal.php diff --git a/modals/client_file_link_asset_modal.php b/user/modals/client_file_link_asset_modal.php similarity index 100% rename from modals/client_file_link_asset_modal.php rename to user/modals/client_file_link_asset_modal.php diff --git a/modals/client_file_upload_modal.php b/user/modals/client_file_upload_modal.php similarity index 100% rename from modals/client_file_upload_modal.php rename to user/modals/client_file_upload_modal.php diff --git a/modals/client_file_view_modal.php b/user/modals/client_file_view_modal.php similarity index 100% rename from modals/client_file_view_modal.php rename to user/modals/client_file_view_modal.php diff --git a/modals/client_rack_add_modal.php b/user/modals/client_rack_add_modal.php similarity index 100% rename from modals/client_rack_add_modal.php rename to user/modals/client_rack_add_modal.php diff --git a/modals/client_recurring_export_modal.php b/user/modals/client_recurring_export_modal.php similarity index 100% rename from modals/client_recurring_export_modal.php rename to user/modals/client_recurring_export_modal.php diff --git a/modals/clients/client_add.php b/user/modals/clients/client_add.php similarity index 100% rename from modals/clients/client_add.php rename to user/modals/clients/client_add.php diff --git a/modals/clients/client_bulk_assign_tags.php b/user/modals/clients/client_bulk_assign_tags.php similarity index 100% rename from modals/clients/client_bulk_assign_tags.php rename to user/modals/clients/client_bulk_assign_tags.php diff --git a/modals/clients/client_bulk_edit_hourly_rate.php b/user/modals/clients/client_bulk_edit_hourly_rate.php similarity index 100% rename from modals/clients/client_bulk_edit_hourly_rate.php rename to user/modals/clients/client_bulk_edit_hourly_rate.php diff --git a/modals/clients/client_bulk_edit_industry.php b/user/modals/clients/client_bulk_edit_industry.php similarity index 100% rename from modals/clients/client_bulk_edit_industry.php rename to user/modals/clients/client_bulk_edit_industry.php diff --git a/modals/clients/client_bulk_edit_referral.php b/user/modals/clients/client_bulk_edit_referral.php similarity index 100% rename from modals/clients/client_bulk_edit_referral.php rename to user/modals/clients/client_bulk_edit_referral.php diff --git a/modals/clients/client_bulk_email.php b/user/modals/clients/client_bulk_email.php similarity index 100% rename from modals/clients/client_bulk_email.php rename to user/modals/clients/client_bulk_email.php diff --git a/modals/clients/client_credit_add.php b/user/modals/clients/client_credit_add.php similarity index 100% rename from modals/clients/client_credit_add.php rename to user/modals/clients/client_credit_add.php diff --git a/modals/clients/client_delete.php b/user/modals/clients/client_delete.php similarity index 100% rename from modals/clients/client_delete.php rename to user/modals/clients/client_delete.php diff --git a/modals/clients/client_download_pdf.php b/user/modals/clients/client_download_pdf.php similarity index 100% rename from modals/clients/client_download_pdf.php rename to user/modals/clients/client_download_pdf.php diff --git a/modals/clients/client_edit.php b/user/modals/clients/client_edit.php similarity index 100% rename from modals/clients/client_edit.php rename to user/modals/clients/client_edit.php diff --git a/modals/clients/client_export.php b/user/modals/clients/client_export.php similarity index 100% rename from modals/clients/client_export.php rename to user/modals/clients/client_export.php diff --git a/modals/clients/client_import.php b/user/modals/clients/client_import.php similarity index 100% rename from modals/clients/client_import.php rename to user/modals/clients/client_import.php diff --git a/modals/contact_add_modal.php b/user/modals/contact_add_modal.php similarity index 100% rename from modals/contact_add_modal.php rename to user/modals/contact_add_modal.php diff --git a/modals/contact_archive_modal.php b/user/modals/contact_archive_modal.php similarity index 100% rename from modals/contact_archive_modal.php rename to user/modals/contact_archive_modal.php diff --git a/modals/contact_bulk_assign_location_modal.php b/user/modals/contact_bulk_assign_location_modal.php similarity index 100% rename from modals/contact_bulk_assign_location_modal.php rename to user/modals/contact_bulk_assign_location_modal.php diff --git a/modals/contact_bulk_assign_tags_modal.php b/user/modals/contact_bulk_assign_tags_modal.php similarity index 100% rename from modals/contact_bulk_assign_tags_modal.php rename to user/modals/contact_bulk_assign_tags_modal.php diff --git a/modals/contact_bulk_edit_department_modal.php b/user/modals/contact_bulk_edit_department_modal.php similarity index 100% rename from modals/contact_bulk_edit_department_modal.php rename to user/modals/contact_bulk_edit_department_modal.php diff --git a/modals/contact_bulk_edit_phone_modal.php b/user/modals/contact_bulk_edit_phone_modal.php similarity index 100% rename from modals/contact_bulk_edit_phone_modal.php rename to user/modals/contact_bulk_edit_phone_modal.php diff --git a/modals/contact_bulk_edit_role_modal.php b/user/modals/contact_bulk_edit_role_modal.php similarity index 100% rename from modals/contact_bulk_edit_role_modal.php rename to user/modals/contact_bulk_edit_role_modal.php diff --git a/modals/contact_bulk_email_modal.php b/user/modals/contact_bulk_email_modal.php similarity index 100% rename from modals/contact_bulk_email_modal.php rename to user/modals/contact_bulk_email_modal.php diff --git a/modals/contact_create_note_modal.php b/user/modals/contact_create_note_modal.php similarity index 100% rename from modals/contact_create_note_modal.php rename to user/modals/contact_create_note_modal.php diff --git a/modals/contact_export_modal.php b/user/modals/contact_export_modal.php similarity index 100% rename from modals/contact_export_modal.php rename to user/modals/contact_export_modal.php diff --git a/modals/contact_import_modal.php b/user/modals/contact_import_modal.php similarity index 100% rename from modals/contact_import_modal.php rename to user/modals/contact_import_modal.php diff --git a/modals/contact_invite_modal.php b/user/modals/contact_invite_modal.php similarity index 100% rename from modals/contact_invite_modal.php rename to user/modals/contact_invite_modal.php diff --git a/modals/credential_add_modal.php b/user/modals/credential_add_modal.php similarity index 100% rename from modals/credential_add_modal.php rename to user/modals/credential_add_modal.php diff --git a/modals/credential_bulk_assign_tags_modal.php b/user/modals/credential_bulk_assign_tags_modal.php similarity index 100% rename from modals/credential_bulk_assign_tags_modal.php rename to user/modals/credential_bulk_assign_tags_modal.php diff --git a/modals/credential_export_modal.php b/user/modals/credential_export_modal.php similarity index 100% rename from modals/credential_export_modal.php rename to user/modals/credential_export_modal.php diff --git a/modals/credential_import_modal.php b/user/modals/credential_import_modal.php similarity index 100% rename from modals/credential_import_modal.php rename to user/modals/credential_import_modal.php diff --git a/modals/custom_field_create_modal.php b/user/modals/custom_field_create_modal.php similarity index 100% rename from modals/custom_field_create_modal.php rename to user/modals/custom_field_create_modal.php diff --git a/modals/custom_field_edit_modal.php b/user/modals/custom_field_edit_modal.php similarity index 100% rename from modals/custom_field_edit_modal.php rename to user/modals/custom_field_edit_modal.php diff --git a/modals/document_edit_visibility_modal.php b/user/modals/document_edit_visibility_modal.php similarity index 100% rename from modals/document_edit_visibility_modal.php rename to user/modals/document_edit_visibility_modal.php diff --git a/modals/domain_add_modal.php b/user/modals/domain_add_modal.php similarity index 100% rename from modals/domain_add_modal.php rename to user/modals/domain_add_modal.php diff --git a/modals/domain_export_modal.php b/user/modals/domain_export_modal.php similarity index 100% rename from modals/domain_export_modal.php rename to user/modals/domain_export_modal.php diff --git a/modals/expense_add_modal.php b/user/modals/expense_add_modal.php similarity index 100% rename from modals/expense_add_modal.php rename to user/modals/expense_add_modal.php diff --git a/modals/expense_bulk_edit_account_modal.php b/user/modals/expense_bulk_edit_account_modal.php similarity index 100% rename from modals/expense_bulk_edit_account_modal.php rename to user/modals/expense_bulk_edit_account_modal.php diff --git a/modals/expense_bulk_edit_category_modal.php b/user/modals/expense_bulk_edit_category_modal.php similarity index 100% rename from modals/expense_bulk_edit_category_modal.php rename to user/modals/expense_bulk_edit_category_modal.php diff --git a/modals/expense_bulk_edit_client_modal.php b/user/modals/expense_bulk_edit_client_modal.php similarity index 100% rename from modals/expense_bulk_edit_client_modal.php rename to user/modals/expense_bulk_edit_client_modal.php diff --git a/modals/expense_export_modal.php b/user/modals/expense_export_modal.php similarity index 100% rename from modals/expense_export_modal.php rename to user/modals/expense_export_modal.php diff --git a/modals/folder_create_modal.php b/user/modals/folder_create_modal.php similarity index 100% rename from modals/folder_create_modal.php rename to user/modals/folder_create_modal.php diff --git a/modals/invoice_add_modal.php b/user/modals/invoice_add_modal.php similarity index 100% rename from modals/invoice_add_modal.php rename to user/modals/invoice_add_modal.php diff --git a/modals/invoice_add_ticket_modal.php b/user/modals/invoice_add_ticket_modal.php similarity index 100% rename from modals/invoice_add_ticket_modal.php rename to user/modals/invoice_add_ticket_modal.php diff --git a/modals/invoice_bulk_edit_category_modal.php b/user/modals/invoice_bulk_edit_category_modal.php similarity index 100% rename from modals/invoice_bulk_edit_category_modal.php rename to user/modals/invoice_bulk_edit_category_modal.php diff --git a/modals/invoice_export_modal.php b/user/modals/invoice_export_modal.php similarity index 100% rename from modals/invoice_export_modal.php rename to user/modals/invoice_export_modal.php diff --git a/modals/invoice_note_modal.php b/user/modals/invoice_note_modal.php similarity index 100% rename from modals/invoice_note_modal.php rename to user/modals/invoice_note_modal.php diff --git a/modals/invoice_payment_add_bulk_modal.php b/user/modals/invoice_payment_add_bulk_modal.php similarity index 100% rename from modals/invoice_payment_add_bulk_modal.php rename to user/modals/invoice_payment_add_bulk_modal.php diff --git a/modals/invoice_recurring_add_modal.php b/user/modals/invoice_recurring_add_modal.php similarity index 100% rename from modals/invoice_recurring_add_modal.php rename to user/modals/invoice_recurring_add_modal.php diff --git a/modals/item_edit_modal.php b/user/modals/item_edit_modal.php similarity index 100% rename from modals/item_edit_modal.php rename to user/modals/item_edit_modal.php diff --git a/modals/location_add_modal.php b/user/modals/location_add_modal.php similarity index 100% rename from modals/location_add_modal.php rename to user/modals/location_add_modal.php diff --git a/modals/location_bulk_assign_tags_modal.php b/user/modals/location_bulk_assign_tags_modal.php similarity index 100% rename from modals/location_bulk_assign_tags_modal.php rename to user/modals/location_bulk_assign_tags_modal.php diff --git a/modals/location_export_modal.php b/user/modals/location_export_modal.php similarity index 100% rename from modals/location_export_modal.php rename to user/modals/location_export_modal.php diff --git a/modals/location_import_modal.php b/user/modals/location_import_modal.php similarity index 100% rename from modals/location_import_modal.php rename to user/modals/location_import_modal.php diff --git a/modals/network_add_modal.php b/user/modals/network_add_modal.php similarity index 100% rename from modals/network_add_modal.php rename to user/modals/network_add_modal.php diff --git a/modals/network_export_modal.php b/user/modals/network_export_modal.php similarity index 100% rename from modals/network_export_modal.php rename to user/modals/network_export_modal.php diff --git a/modals/payment_export_modal.php b/user/modals/payment_export_modal.php similarity index 100% rename from modals/payment_export_modal.php rename to user/modals/payment_export_modal.php diff --git a/modals/product_add_modal.php b/user/modals/product_add_modal.php similarity index 100% rename from modals/product_add_modal.php rename to user/modals/product_add_modal.php diff --git a/modals/product_bulk_edit_category_modal.php b/user/modals/product_bulk_edit_category_modal.php similarity index 100% rename from modals/product_bulk_edit_category_modal.php rename to user/modals/product_bulk_edit_category_modal.php diff --git a/modals/product_export_modal.php b/user/modals/product_export_modal.php similarity index 100% rename from modals/product_export_modal.php rename to user/modals/product_export_modal.php diff --git a/modals/project_add_modal.php b/user/modals/project_add_modal.php similarity index 100% rename from modals/project_add_modal.php rename to user/modals/project_add_modal.php diff --git a/modals/project_link_closed_ticket_modal.php b/user/modals/project_link_closed_ticket_modal.php similarity index 100% rename from modals/project_link_closed_ticket_modal.php rename to user/modals/project_link_closed_ticket_modal.php diff --git a/modals/project_link_ticket_modal.php b/user/modals/project_link_ticket_modal.php similarity index 100% rename from modals/project_link_ticket_modal.php rename to user/modals/project_link_ticket_modal.php diff --git a/modals/quote_add_modal.php b/user/modals/quote_add_modal.php similarity index 100% rename from modals/quote_add_modal.php rename to user/modals/quote_add_modal.php diff --git a/modals/quote_export_modal.php b/user/modals/quote_export_modal.php similarity index 100% rename from modals/quote_export_modal.php rename to user/modals/quote_export_modal.php diff --git a/modals/quote_note_modal.php b/user/modals/quote_note_modal.php similarity index 100% rename from modals/quote_note_modal.php rename to user/modals/quote_note_modal.php diff --git a/modals/quote_to_invoice_modal.php b/user/modals/quote_to_invoice_modal.php similarity index 100% rename from modals/quote_to_invoice_modal.php rename to user/modals/quote_to_invoice_modal.php diff --git a/modals/recurring_expense_create_modal.php b/user/modals/recurring_expense_create_modal.php similarity index 100% rename from modals/recurring_expense_create_modal.php rename to user/modals/recurring_expense_create_modal.php diff --git a/modals/recurring_invoice_add_modal.php b/user/modals/recurring_invoice_add_modal.php similarity index 100% rename from modals/recurring_invoice_add_modal.php rename to user/modals/recurring_invoice_add_modal.php diff --git a/modals/recurring_invoice_note_modal.php b/user/modals/recurring_invoice_note_modal.php similarity index 100% rename from modals/recurring_invoice_note_modal.php rename to user/modals/recurring_invoice_note_modal.php diff --git a/modals/recurring_payment_add_modal.php b/user/modals/recurring_payment_add_modal.php similarity index 100% rename from modals/recurring_payment_add_modal.php rename to user/modals/recurring_payment_add_modal.php diff --git a/modals/recurring_ticket_add_modal.php b/user/modals/recurring_ticket_add_modal.php similarity index 100% rename from modals/recurring_ticket_add_modal.php rename to user/modals/recurring_ticket_add_modal.php diff --git a/modals/revenue_add_modal.php b/user/modals/revenue_add_modal.php similarity index 100% rename from modals/revenue_add_modal.php rename to user/modals/revenue_add_modal.php diff --git a/modals/service_add_modal.php b/user/modals/service_add_modal.php similarity index 100% rename from modals/service_add_modal.php rename to user/modals/service_add_modal.php diff --git a/modals/share_modal.php b/user/modals/share_modal.php similarity index 100% rename from modals/share_modal.php rename to user/modals/share_modal.php diff --git a/modals/software_add_from_template_modal.php b/user/modals/software_add_from_template_modal.php similarity index 100% rename from modals/software_add_from_template_modal.php rename to user/modals/software_add_from_template_modal.php diff --git a/modals/software_add_modal.php b/user/modals/software_add_modal.php similarity index 100% rename from modals/software_add_modal.php rename to user/modals/software_add_modal.php diff --git a/modals/software_export_modal.php b/user/modals/software_export_modal.php similarity index 100% rename from modals/software_export_modal.php rename to user/modals/software_export_modal.php diff --git a/modals/ticket_add_modal.php b/user/modals/ticket_add_modal.php similarity index 100% rename from modals/ticket_add_modal.php rename to user/modals/ticket_add_modal.php diff --git a/modals/ticket_add_modal_v2.php b/user/modals/ticket_add_modal_v2.php similarity index 100% rename from modals/ticket_add_modal_v2.php rename to user/modals/ticket_add_modal_v2.php diff --git a/modals/ticket_add_watcher_modal.php b/user/modals/ticket_add_watcher_modal.php similarity index 100% rename from modals/ticket_add_watcher_modal.php rename to user/modals/ticket_add_watcher_modal.php diff --git a/modals/ticket_bulk_add_project_modal.php b/user/modals/ticket_bulk_add_project_modal.php similarity index 100% rename from modals/ticket_bulk_add_project_modal.php rename to user/modals/ticket_bulk_add_project_modal.php diff --git a/modals/ticket_bulk_assign_modal.php b/user/modals/ticket_bulk_assign_modal.php similarity index 100% rename from modals/ticket_bulk_assign_modal.php rename to user/modals/ticket_bulk_assign_modal.php diff --git a/modals/ticket_bulk_edit_category_modal.php b/user/modals/ticket_bulk_edit_category_modal.php similarity index 100% rename from modals/ticket_bulk_edit_category_modal.php rename to user/modals/ticket_bulk_edit_category_modal.php diff --git a/modals/ticket_bulk_edit_priority_modal.php b/user/modals/ticket_bulk_edit_priority_modal.php similarity index 100% rename from modals/ticket_bulk_edit_priority_modal.php rename to user/modals/ticket_bulk_edit_priority_modal.php diff --git a/modals/ticket_bulk_merge_modal.php b/user/modals/ticket_bulk_merge_modal.php similarity index 100% rename from modals/ticket_bulk_merge_modal.php rename to user/modals/ticket_bulk_merge_modal.php diff --git a/modals/ticket_bulk_reply_modal.php b/user/modals/ticket_bulk_reply_modal.php similarity index 100% rename from modals/ticket_bulk_reply_modal.php rename to user/modals/ticket_bulk_reply_modal.php diff --git a/modals/ticket_bulk_resolve_modal.php b/user/modals/ticket_bulk_resolve_modal.php similarity index 100% rename from modals/ticket_bulk_resolve_modal.php rename to user/modals/ticket_bulk_resolve_modal.php diff --git a/modals/ticket_change_client_modal.php b/user/modals/ticket_change_client_modal.php similarity index 100% rename from modals/ticket_change_client_modal.php rename to user/modals/ticket_change_client_modal.php diff --git a/modals/ticket_edit_asset_modal.php b/user/modals/ticket_edit_asset_modal.php similarity index 100% rename from modals/ticket_edit_asset_modal.php rename to user/modals/ticket_edit_asset_modal.php diff --git a/modals/ticket_edit_schedule_modal.php b/user/modals/ticket_edit_schedule_modal.php similarity index 100% rename from modals/ticket_edit_schedule_modal.php rename to user/modals/ticket_edit_schedule_modal.php diff --git a/modals/ticket_edit_vendor_modal.php b/user/modals/ticket_edit_vendor_modal.php similarity index 100% rename from modals/ticket_edit_vendor_modal.php rename to user/modals/ticket_edit_vendor_modal.php diff --git a/modals/ticket_export_modal.php b/user/modals/ticket_export_modal.php similarity index 100% rename from modals/ticket_export_modal.php rename to user/modals/ticket_export_modal.php diff --git a/modals/ticket_invoice_add_modal.php b/user/modals/ticket_invoice_add_modal.php similarity index 100% rename from modals/ticket_invoice_add_modal.php rename to user/modals/ticket_invoice_add_modal.php diff --git a/modals/ticket_merge_modal.php b/user/modals/ticket_merge_modal.php similarity index 100% rename from modals/ticket_merge_modal.php rename to user/modals/ticket_merge_modal.php diff --git a/modals/top_nav_tickets_modal.php b/user/modals/top_nav_tickets_modal.php similarity index 100% rename from modals/top_nav_tickets_modal.php rename to user/modals/top_nav_tickets_modal.php diff --git a/modals/transfer_add_modal.php b/user/modals/transfer_add_modal.php similarity index 100% rename from modals/transfer_add_modal.php rename to user/modals/transfer_add_modal.php diff --git a/modals/trip_add_modal.php b/user/modals/trip_add_modal.php similarity index 100% rename from modals/trip_add_modal.php rename to user/modals/trip_add_modal.php diff --git a/modals/trip_export_modal.php b/user/modals/trip_export_modal.php similarity index 100% rename from modals/trip_export_modal.php rename to user/modals/trip_export_modal.php diff --git a/modals/user_mfa_modal.php b/user/modals/user_mfa_modal.php similarity index 100% rename from modals/user_mfa_modal.php rename to user/modals/user_mfa_modal.php diff --git a/modals/vendor_add_from_template_modal.php b/user/modals/vendor_add_from_template_modal.php similarity index 100% rename from modals/vendor_add_from_template_modal.php rename to user/modals/vendor_add_from_template_modal.php diff --git a/modals/vendor_add_modal.php b/user/modals/vendor_add_modal.php similarity index 100% rename from modals/vendor_add_modal.php rename to user/modals/vendor_add_modal.php diff --git a/modals/vendor_contact_add_modal.php b/user/modals/vendor_contact_add_modal.php similarity index 100% rename from modals/vendor_contact_add_modal.php rename to user/modals/vendor_contact_add_modal.php diff --git a/modals/vendor_contact_edit_modal.php b/user/modals/vendor_contact_edit_modal.php similarity index 100% rename from modals/vendor_contact_edit_modal.php rename to user/modals/vendor_contact_edit_modal.php diff --git a/modals/vendor_export_modal.php b/user/modals/vendor_export_modal.php similarity index 100% rename from modals/vendor_export_modal.php rename to user/modals/vendor_export_modal.php diff --git a/networks.php b/user/networks.php similarity index 99% rename from networks.php rename to user/networks.php index 083dfae0..1e8d052c 100644 --- a/networks.php +++ b/user/networks.php @@ -362,7 +362,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -376,4 +376,4 @@ require_once "modals/network_export_modal.php";
    - +
    - +
    -
    @@ -285,4 +285,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/product_add_modal.php"; require_once "modals/product_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/project_details.php b/user/project_details.php similarity index 99% rename from project_details.php rename to user/project_details.php index ba893ef7..4b6e63b5 100644 --- a/project_details.php +++ b/user/project_details.php @@ -561,7 +561,7 @@ if (isset($_GET['project_id'])) { } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/projects.php b/user/projects.php similarity index 99% rename from projects.php rename to user/projects.php index 7e44cac9..8b57539b 100644 --- a/projects.php +++ b/user/projects.php @@ -336,10 +336,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    There is no Quote here
    Back to Quotes"; - require_once "includes/footer.php"; + require_once "../includes/footer.php"; exit(); } @@ -593,7 +593,7 @@ if (isset($_GET['quote_id'])) { require_once "modals/quote_note_modal.php"; } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/quotes.php b/user/quotes.php similarity index 99% rename from quotes.php rename to user/quotes.php index 3e5f5764..742812f1 100644 --- a/quotes.php +++ b/user/quotes.php @@ -273,7 +273,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -282,4 +282,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/quote_add_modal.php"; require_once "modals/quote_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/recurring_expenses.php b/user/recurring_expenses.php similarity index 99% rename from recurring_expenses.php rename to user/recurring_expenses.php index 6743df79..db221aaa 100644 --- a/recurring_expenses.php +++ b/user/recurring_expenses.php @@ -233,7 +233,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -241,5 +241,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); There is no Recurring Invoice here
    Back to Recurring Invoices"; - require_once "includes/footer.php"; + require_once "../includes/footer.php"; exit(); } @@ -495,7 +495,7 @@ if (isset($_GET['recurring_invoice_id'])) { } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/recurring_invoices.php b/user/recurring_invoices.php similarity index 99% rename from recurring_invoices.php rename to user/recurring_invoices.php index dda221a6..9bc82260 100644 --- a/recurring_invoices.php +++ b/user/recurring_invoices.php @@ -295,7 +295,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -303,4 +303,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -248,4 +248,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +

    ITFlow   ·   Docs   ·   Forum   ·   Services

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/reports/includes/header.php b/user/reports/includes/header.php similarity index 51% rename from reports/includes/header.php rename to user/reports/includes/header.php index 8a22fd82..76e42de5 100644 --- a/reports/includes/header.php +++ b/user/reports/includes/header.php @@ -22,28 +22,28 @@ header("X-Frame-Options: DENY"); Favicon If Fav Icon exists else use the default one --> - + - + - - - - - - - + + + + + + + - + - + - - + + - @@ -193,4 +193,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - @@ -332,4 +332,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/software_add_modal.php"; require_once "modals/software_add_from_template_modal.php"; require_once "modals/software_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; diff --git a/ticket.php b/user/ticket.php similarity index 99% rename from ticket.php rename to user/ticket.php index d638c733..6f5e20fb 100644 --- a/ticket.php +++ b/user/ticket.php @@ -46,7 +46,7 @@ if (isset($_GET['ticket_id'])) { if (mysqli_num_rows($sql) == 0) { echo "

    Nothing to see here

    Go Back
    "; - include_once "includes/footer.php"; + include_once "../includes/footer.php"; } else { $row = mysqli_fetch_array($sql); @@ -1299,7 +1299,7 @@ if (isset($_GET['ticket_id'])) { } } -require_once "includes/footer.php"; +require_once "../includes/footer.php"; ?> diff --git a/tickets.php b/user/tickets.php similarity index 99% rename from tickets.php rename to user/tickets.php index 8e4b394d..1388d416 100644 --- a/tickets.php +++ b/user/tickets.php @@ -441,4 +441,4 @@ if (isset($_GET["view"])) { - + diff --git a/transfers.php b/user/transfers.php similarity index 99% rename from transfers.php rename to user/transfers.php index 6924939f..8ff79ed8 100644 --- a/transfers.php +++ b/user/transfers.php @@ -272,7 +272,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -280,5 +280,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -248,4 +248,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -294,4 +294,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "modals/vendor_add_modal.php"; require_once "modals/vendor_add_from_template_modal.php"; require_once "modals/vendor_export_modal.php"; -require_once "includes/footer.php"; +require_once "../includes/footer.php"; From 38e2e50a299d566565ef1e2fca62910a6b18fd91 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 28 Jul 2025 22:48:44 -0400 Subject: [PATCH 102/244] More progress on consolidating files into user and admin --- admin/includes/footer.php | 53 --- admin/includes/header.php | 54 --- admin/includes/inc_all_admin.php | 2 +- admin/includes/modal_footer.php | 9 - admin/includes/modal_header.php | 13 - includes/client_side_nav.php | 354 ------------------ includes/db.php | 6 + includes/footer.php | 34 +- includes/header.php | 57 +-- includes/inc_all_client.php | 316 ---------------- includes/inc_all_user.php | 12 - includes/inc_client_overview_all.php | 12 - includes/inc_xcustom.php | 13 - .../includes}/client_overview_side_nav.php | 0 .../includes}/get_side_nav_counts.php | 0 user/includes/inc_all.php | 2 +- user/includes/inc_all_client.php | 24 +- user/includes/inc_all_user.php | 21 +- user/includes/inc_client_overview_all.php | 13 + .../includes}/inc_client_top_head.php | 6 +- {includes => user/includes}/user_side_nav.php | 0 .../modals/{clients => client}/client_add.php | 0 .../client_bulk_assign_tags.php | 0 .../client_bulk_edit_hourly_rate.php | 0 .../client_bulk_edit_industry.php | 0 .../client_bulk_edit_referral.php | 0 .../{clients => client}/client_bulk_email.php | 0 .../{clients => client}/client_credit_add.php | 0 .../{clients => client}/client_delete.php | 2 +- .../client_download_pdf.php | 0 .../{clients => client}/client_edit.php | 0 .../{clients => client}/client_export.php | 0 .../{clients => client}/client_import.php | 0 user/reports/includes/footer.php | 53 --- user/reports/includes/header.php | 54 --- user/reports/includes/inc_all_reports.php | 2 +- user/vendors.php | 4 +- 37 files changed, 98 insertions(+), 1018 deletions(-) delete mode 100644 admin/includes/footer.php delete mode 100644 admin/includes/header.php delete mode 100644 admin/includes/modal_footer.php delete mode 100644 admin/includes/modal_header.php delete mode 100644 includes/client_side_nav.php create mode 100644 includes/db.php delete mode 100644 includes/inc_all_client.php delete mode 100644 includes/inc_all_user.php delete mode 100644 includes/inc_client_overview_all.php delete mode 100644 includes/inc_xcustom.php rename {includes => user/includes}/client_overview_side_nav.php (100%) rename {includes => user/includes}/get_side_nav_counts.php (100%) create mode 100644 user/includes/inc_client_overview_all.php rename {includes => user/includes}/inc_client_top_head.php (98%) rename {includes => user/includes}/user_side_nav.php (100%) rename user/modals/{clients => client}/client_add.php (100%) rename user/modals/{clients => client}/client_bulk_assign_tags.php (100%) rename user/modals/{clients => client}/client_bulk_edit_hourly_rate.php (100%) rename user/modals/{clients => client}/client_bulk_edit_industry.php (100%) rename user/modals/{clients => client}/client_bulk_edit_referral.php (100%) rename user/modals/{clients => client}/client_bulk_email.php (100%) rename user/modals/{clients => client}/client_credit_add.php (100%) rename user/modals/{clients => client}/client_delete.php (96%) rename user/modals/{clients => client}/client_download_pdf.php (100%) rename user/modals/{clients => client}/client_edit.php (100%) rename user/modals/{clients => client}/client_export.php (100%) rename user/modals/{clients => client}/client_import.php (100%) delete mode 100644 user/reports/includes/footer.php delete mode 100644 user/reports/includes/header.php diff --git a/admin/includes/footer.php b/admin/includes/footer.php deleted file mode 100644 index 60235990..00000000 --- a/admin/includes/footer.php +++ /dev/null @@ -1,53 +0,0 @@ - - - -

    ITFlow   ·   Docs   ·   Forum   ·   Services

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/admin/includes/header.php b/admin/includes/header.php deleted file mode 100644 index 8a22fd82..00000000 --- a/admin/includes/header.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - <?php echo $session_company_name; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"> -
    diff --git a/admin/includes/inc_all_admin.php b/admin/includes/inc_all_admin.php index 53d050f9..fb600215 100644 --- a/admin/includes/inc_all_admin.php +++ b/admin/includes/inc_all_admin.php @@ -7,7 +7,7 @@ require_once "../includes/page_title.php"; if (!isset($session_is_admin) || !$session_is_admin) { exit(WORDING_ROLECHECK_FAILED . "
    Tell your admin: Your role does not have admin access."); } -require_once "includes/header.php"; +require_once "../includes/header.php"; require_once "../includes/top_nav.php"; require_once "includes/side_nav.php"; require_once "../includes/inc_wrapper.php"; diff --git a/admin/includes/modal_footer.php b/admin/includes/modal_footer.php deleted file mode 100644 index 4bbe5766..00000000 --- a/admin/includes/modal_footer.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - $content]); -?> \ No newline at end of file diff --git a/admin/includes/modal_header.php b/admin/includes/modal_header.php deleted file mode 100644 index 695f098a..00000000 --- a/admin/includes/modal_header.php +++ /dev/null @@ -1,13 +0,0 @@ - 'ID missing.']); -// exit; -//} diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php deleted file mode 100644 index 6fc74f3b..00000000 --- a/includes/client_side_nav.php +++ /dev/null @@ -1,354 +0,0 @@ - - diff --git a/includes/db.php b/includes/db.php new file mode 100644 index 00000000..c22463ae --- /dev/null +++ b/includes/db.php @@ -0,0 +1,6 @@ + +if ($_SERVER['REQUEST_URI'] === '/admin') { ?>

    ITFlow   ·   Docs   ·   Forum   ·   Services


    @@ -22,24 +22,24 @@ if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?> - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + diff --git a/includes/header.php b/includes/header.php index 483084e1..9c46be30 100644 --- a/includes/header.php +++ b/includes/header.php @@ -6,6 +6,13 @@ header("X-Frame-Options: DENY"); +// Determine URI prepending logic (URI Routing maybe move to /includes/router.php) +if ($_SERVER['REQUEST_URI'] === '/user/reports') { + $prepend_uri = "../"; +} else { + $prepend_uri = ''; +} + ?> @@ -18,37 +25,33 @@ header("X-Frame-Options: DENY"); <?php echo $session_company_name; ?> - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + accent- + ">
    + diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php deleted file mode 100644 index 40cccea6..00000000 --- a/includes/inc_all_client.php +++ /dev/null @@ -1,316 +0,0 @@ -window.history.back();"; - exit(); - } - - $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id"); - - $sql = mysqli_query( - $mysqli, - "SELECT * FROM clients - LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 - LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 - WHERE client_id = $client_id" - ); - - if (mysqli_num_rows($sql) == 0) { - require_once "header.php"; - - echo "

    Nothing to see here

    "; - } else { - - $row = mysqli_fetch_array($sql); - $client_name = nullable_htmlentities($row['client_name']); - $client_is_lead = intval($row['client_lead']); - $client_type = nullable_htmlentities($row['client_type']); - $client_website = nullable_htmlentities($row['client_website']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - if ($client_net_terms == 0) { - $client_net_terms = $config_default_net_terms; - } - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); - $client_rate = floatval($row['client_rate']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = nullable_htmlentities($row['client_created_at']); - $client_archived_at = nullable_htmlentities($row['client_archived_at']); - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $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)); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - $contact_primary = intval($row['contact_primary']); - $location_id = intval($row['location_id']); - $location_name = nullable_htmlentities($row['location_name']); - $location_address = nullable_htmlentities($row['location_address']); - $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']); - $location_phone_country_code = nullable_htmlentities($row['location_phone_country_code']); - $location_phone = nullable_htmlentities(formatPhoneNumber($row['location_phone'], $location_phone_country_code)); - $location_primary = intval($row['location_primary']); - - // Tab Title // No Sanitizing needed - $tab_title = $row['client_name']; - - // Client Tags - - $client_tag_name_display_array = array(); - $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($client_tag_icon)) { - $client_tag_icon = "tag"; - } - - $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name"; - } - $client_tags_display = implode('', $client_tag_name_display_array); - - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'"); - $row = mysqli_fetch_array($sql_invoice_amounts); - - $invoice_amounts = floatval($row['invoice_amounts']); - - $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_amount_paid); - - $amount_paid = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - // Get Credit Balance - $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); - $row = mysqli_fetch_array($sql_credit_balance); - - $credit_balance = floatval($row['credit_balance']); - - // Badge Counts - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); - $num_contacts = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id")); - $num_locations = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id")); - $num_assets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4 AND ticket_client_id = $client_id")); - $num_active_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NOT NULL AND ticket_client_id = $client_id")); - $num_closed_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id")); - $num_recurring_tickets = $row['num']; - - // Active Project Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL AND project_client_id = $client_id")); - $num_active_projects = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); - $num_services = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id")); - $num_vendors = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id")); - $num_credentials = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id")); - $num_networks = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('rack_id') AS num FROM racks WHERE rack_archived_at IS NULL AND rack_client_id = $client_id")); - $num_racks = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id")); - $num_domains = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id")); - $num_certificates = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id")); - $num_software = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_open = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_draft = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_sent = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_viewed = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_partial = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_paid = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id")); - $num_quotes = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL AND recurring_invoice_client_id = $client_id")); - $num_recurring_invoices = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id")); - $num_payments = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id")); - $num_files = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); - $num_documents = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); - $num_calendar_events = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); - $num_trips = $row['num']; - - // Expiring Items - - // Count Domains Expiring within 45 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('domain_id') AS num FROM domains - WHERE domain_client_id = $client_id - AND domain_expire IS NOT NULL - AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY - AND domain_archived_at IS NULL" - )); - $num_domains_expiring_warning= intval($row['num']); - - // Count Domains Expired or within 7 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('domain_id') AS num FROM domains - WHERE domain_client_id = $client_id - AND domain_expire IS NOT NULL - AND ( - domain_expire < CURRENT_DATE - OR domain_expire < CURRENT_DATE + INTERVAL 7 DAY - ) - AND domain_archived_at IS NULL" - )); - $num_domains_urgent = intval($row['num']); - - // Count Certificates Expiring within 7 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('certificate_id') AS num FROM certificates - WHERE certificate_client_id = $client_id - AND certificate_expire IS NOT NULL - AND certificate_expire < CURRENT_DATE + INTERVAL 7 DAY - AND certificate_archived_at IS NULL" - )); - $num_certificates_expiring = intval($row['num']); - - // Count Certificates Expired or within 7 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('certificate_id') AS num FROM certificates - WHERE certificate_client_id = $client_id - AND certificate_expire IS NOT NULL - AND ( - certificate_expire < CURRENT_DATE - OR certificate_expire < CURRENT_DATE + INTERVAL 1 DAY - ) - AND certificate_archived_at IS NULL" - )); - $num_certificates_expired = intval($row['num']); - - // Count Software Expiring within 90 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('software_id') AS num FROM software - WHERE software_client_id = $client_id - AND software_expire IS NOT NULL - AND software_expire < CURRENT_DATE + INTERVAL 45 DAY - AND software_archived_at IS NULL" - )); - $num_software_expiring = intval($row['num']); - - // Count Software Expired or within 14 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('software_id') AS num FROM software - WHERE software_client_id = $client_id - AND software_expire IS NOT NULL - AND ( - software_expire < CURRENT_DATE - OR software_expire < CURRENT_DATE + INTERVAL 7 DAY - ) - AND software_archived_at IS NULL" - )); - $num_software_expired = intval($row['num']); - - } -} - -require_once "header.php"; -require_once "top_nav.php"; -require_once "client_side_nav.php"; -require_once "inc_wrapper.php"; -require_once "inc_alert_feedback.php"; -require_once "inc_client_top_head.php"; -require_once "filter_header.php"; diff --git a/includes/inc_all_user.php b/includes/inc_all_user.php deleted file mode 100644 index bafda7b6..00000000 --- a/includes/inc_all_user.php +++ /dev/null @@ -1,12 +0,0 @@ -

    Nothing to see here

    "; } else { @@ -307,10 +307,10 @@ if (isset($_GET['client_id'])) { } } -require_once "header.php"; -require_once "top_nav.php"; -require_once "client_side_nav.php"; -require_once "inc_wrapper.php"; -require_once "inc_alert_feedback.php"; -require_once "inc_client_top_head.php"; -require_once "filter_header.php"; +require_once "../includes/header.php"; +require_once "../includes/top_nav.php"; +require_once "includes/side_nav.php"; +require_once "../includes/inc_wrapper.php"; +require_once "../includes/inc_alert_feedback.php"; +require_once "includes/inc_client_top_head.php"; +require_once "../includes/filter_header.php"; diff --git a/user/includes/inc_all_user.php b/user/includes/inc_all_user.php index bafda7b6..45d12dd3 100644 --- a/user/includes/inc_all_user.php +++ b/user/includes/inc_all_user.php @@ -1,12 +1,13 @@
    - + diff --git a/user/modals/clients/client_download_pdf.php b/user/modals/client/client_download_pdf.php similarity index 100% rename from user/modals/clients/client_download_pdf.php rename to user/modals/client/client_download_pdf.php diff --git a/user/modals/clients/client_edit.php b/user/modals/client/client_edit.php similarity index 100% rename from user/modals/clients/client_edit.php rename to user/modals/client/client_edit.php diff --git a/user/modals/clients/client_export.php b/user/modals/client/client_export.php similarity index 100% rename from user/modals/clients/client_export.php rename to user/modals/client/client_export.php diff --git a/user/modals/clients/client_import.php b/user/modals/client/client_import.php similarity index 100% rename from user/modals/clients/client_import.php rename to user/modals/client/client_import.php diff --git a/user/reports/includes/footer.php b/user/reports/includes/footer.php deleted file mode 100644 index a5449dfa..00000000 --- a/user/reports/includes/footer.php +++ /dev/null @@ -1,53 +0,0 @@ - - - -

    ITFlow   ·   Docs   ·   Forum   ·   Services

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/user/reports/includes/header.php b/user/reports/includes/header.php deleted file mode 100644 index 76e42de5..00000000 --- a/user/reports/includes/header.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - <?php echo $session_company_name; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"> -
    diff --git a/user/reports/includes/inc_all_reports.php b/user/reports/includes/inc_all_reports.php index 1d9b14dc..23f50a66 100644 --- a/user/reports/includes/inc_all_reports.php +++ b/user/reports/includes/inc_all_reports.php @@ -6,7 +6,7 @@ require_once "../../includes/check_login.php"; require_once "../../includes/page_title.php"; // Reporting Perms enforceUserPermission('module_reporting'); -require_once "includes/header.php"; +require_once "../../includes/header.php"; require_once "../../includes/top_nav.php"; require_once "includes/side_nav.php"; require_once "../../includes/inc_wrapper.php"; diff --git a/user/vendors.php b/user/vendors.php index df2290fb..0a5e6e67 100644 --- a/user/vendors.php +++ b/user/vendors.php @@ -283,12 +283,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - - + Date: Mon, 28 Jul 2025 23:29:46 -0400 Subject: [PATCH 103/244] Cleanup some broken links from file dirextory consolidation --- includes/modal_footer.php | 4 ++-- includes/modal_header.php | 6 +++--- user/clients.php | 20 ++++++++++---------- user/modals/client/client_edit.php | 6 +++--- user/post/client.php | 4 ++-- user/post/profile.php | 4 ++-- user/user_details.php | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/includes/modal_footer.php b/includes/modal_footer.php index 4bbe5766..a39ff63f 100644 --- a/includes/modal_footer.php +++ b/includes/modal_footer.php @@ -1,5 +1,5 @@ - - + + Edit @@ -613,11 +613,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -625,10 +625,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
    Editing Client:
    -
    @@ -263,4 +263,4 @@ ob_start();
    - "> + "> Remove Avatar
    From 9ee76213e168f7f0bf8c385222f8b0b7dd011f14 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 29 Jul 2025 14:32:43 -0400 Subject: [PATCH 104/244] Update more broken links from file dirextory consolidation --- admin/ai_model.php | 2 +- admin/ai_provider.php | 2 +- {user => admin}/ajax/ajax_ai_model_edit.php | 4 ++-- {user => admin}/ajax/ajax_ai_provider_edit.php | 4 ++-- {user => admin}/ajax/ajax_category_add.php | 10 +++++----- {user => admin}/ajax/ajax_category_edit.php | 10 +++++----- {user => admin}/ajax/ajax_custom_link_edit.php | 10 +++++----- .../ajax/ajax_custom_ticket_status_edit.php | 10 +++++----- .../ajax/ajax_document_template_edit.php | 10 +++++----- .../ajax/ajax_mail_queue_message_view.php | 8 ++++---- .../ajax/ajax_payment_method_edit.php | 10 +++++----- .../ajax/ajax_payment_provider_edit.php | 10 +++++----- {user => admin}/ajax/ajax_role_edit.php | 10 +++++----- .../ajax/ajax_software_template_edit.php | 10 +++++----- {user => admin}/ajax/ajax_tag_add.php | 10 +++++----- {user => admin}/ajax/ajax_tag_edit.php | 10 +++++----- {user => admin}/ajax/ajax_tax_edit.php | 10 +++++----- .../ajax/ajax_ticket_template_task_edit.php | 10 +++++----- {user => admin}/ajax/ajax_user_edit.php | 10 +++++----- .../ajax/ajax_vendor_template_edit.php | 10 +++++----- admin/{api.php => api_keys.php} | 6 +++--- admin/app_log.php | 4 ++-- admin/audit_log.php | 6 +++--- admin/backup.php | 2 +- admin/category.php | 4 ++-- admin/custom_link.php | 4 ++-- admin/debug.php | 2 +- admin/document_template.php | 6 +++--- admin/document_template_details.php | 12 ++++++------ admin/identity_provider.php | 2 +- admin/mail_queue.php | 8 ++++---- admin/modals/admin_ai_model_add_modal.php | 8 ++++---- admin/modals/admin_ai_provider_add_modal.php | 8 ++++---- admin/modals/admin_api_key_add_modal.php | 8 ++++---- admin/modals/admin_category_add_modal.php | 8 ++++---- admin/modals/admin_custom_link_add_modal.php | 8 ++++---- .../admin_document_template_add_modal.php | 8 ++++---- .../modals/admin_payment_method_add_modal.php | 8 ++++---- .../admin_payment_provider_add_modal.php | 8 ++++---- .../admin_project_template_add_modal.php | 8 ++++---- .../admin_project_template_edit_modal.php | 8 ++++---- ...ject_template_ticket_template_add_modal.php | 8 ++++---- admin/modals/admin_role_add_modal.php | 8 ++++---- .../admin_software_template_add_modal.php | 8 ++++---- admin/modals/admin_tag_add_modal.php | 8 ++++---- admin/modals/admin_tax_add_modal.php | 6 +++--- admin/modals/admin_ticket_status_add_modal.php | 8 ++++---- .../modals/admin_ticket_template_add_modal.php | 8 ++++---- .../admin_ticket_template_edit_modal.php | 8 ++++---- admin/modals/admin_user_add_modal.php | 8 ++++---- admin/modals/admin_user_export_modal.php | 8 ++++---- admin/modals/admin_user_invite_modal.php | 8 ++++---- .../modals/admin_vendor_template_add_modal.php | 8 ++++---- admin/modals/{roles => }/role_add.php | 8 ++++---- admin/modals/{roles => }/role_edit.php | 10 +++++----- admin/modals/{users => }/user_add.php | 8 ++++---- .../{users => }/user_all_reset_password.php | 0 admin/modals/{users => }/user_archive.php | 0 admin/modals/{users => }/user_edit.php | 6 +++--- admin/modals/{users => }/user_export.php | 8 ++++---- admin/modals/{users => }/user_invite.php | 8 ++++---- admin/payment_method.php | 2 +- admin/payment_provider.php | 2 +- admin/project_template.php | 6 +++--- admin/project_template_details.php | 4 ++-- admin/roles.php | 10 +++++----- admin/saved_payment_method.php | 4 ++-- admin/settings_ai.php | 2 +- admin/settings_company.php | 4 ++-- admin/settings_custom_fields.php | 4 ++-- admin/settings_default.php | 2 +- admin/settings_invoice.php | 2 +- admin/settings_localization.php | 2 +- admin/settings_mail.php | 2 +- admin/settings_module.php | 2 +- admin/settings_notification.php | 2 +- admin/settings_online_payment.php | 2 +- admin/settings_online_payment_clients.php | 2 +- admin/settings_project.php | 2 +- admin/settings_quote.php | 2 +- admin/settings_security.php | 2 +- admin/settings_telemetry.php | 2 +- admin/settings_theme.php | 4 ++-- admin/settings_ticket.php | 2 +- admin/software_template.php | 4 ++-- admin/tag.php | 4 ++-- admin/tax.php | 2 +- admin/ticket_status.php | 4 ++-- admin/ticket_template.php | 6 +++--- admin/ticket_template_details.php | 10 +++++----- admin/update.php | 2 +- admin/users.php | 18 +++++++++--------- admin/vendor_template.php | 4 ++-- includes/footer.php | 6 +++--- includes/modal_footer.php | 4 ++-- includes/modal_header.php | 6 +++--- includes/top_nav.php | 4 ++-- .../notifications.php | 18 +++++++++++++----- user/ajax/ajax_account_edit.php | 4 ++-- user/ajax/ajax_asset_copy.php | 8 ++++---- user/ajax/ajax_asset_details.php | 10 +++++----- user/ajax/ajax_asset_edit.php | 10 +++++----- user/ajax/ajax_asset_interface_edit.php | 10 +++++----- user/ajax/ajax_asset_link_credential.php | 10 +++++----- user/ajax/ajax_asset_link_document.php | 10 +++++----- user/ajax/ajax_asset_link_file.php | 10 +++++----- user/ajax/ajax_asset_link_service.php | 10 +++++----- user/ajax/ajax_asset_link_software.php | 10 +++++----- user/ajax/ajax_calendar_edit.php | 10 +++++----- user/ajax/ajax_calendar_event_edit.php | 10 +++++----- user/ajax/ajax_certificate_edit.php | 10 +++++----- user/ajax/ajax_contact_details.php | 10 +++++----- user/ajax/ajax_contact_edit.php | 10 +++++----- user/ajax/ajax_contact_link_asset.php | 10 +++++----- user/ajax/ajax_contact_link_credential.php | 10 +++++----- user/ajax/ajax_contact_link_document.php | 10 +++++----- user/ajax/ajax_contact_link_file.php | 10 +++++----- user/ajax/ajax_contact_link_service.php | 10 +++++----- user/ajax/ajax_contact_link_software.php | 10 +++++----- user/ajax/ajax_contact_note_create.php | 10 +++++----- user/ajax/ajax_credential_edit.php | 10 +++++----- user/ajax/ajax_credential_view.php | 4 ++-- user/ajax/ajax_document_edit.php | 10 +++++----- user/ajax/ajax_document_move.php | 10 +++++----- user/ajax/ajax_document_rename.php | 10 +++++----- user/ajax/ajax_document_version_view.php | 8 ++++---- user/ajax/ajax_document_view.php | 8 ++++---- user/ajax/ajax_domain_edit.php | 10 +++++----- user/ajax/ajax_expense_copy.php | 10 +++++----- user/ajax/ajax_expense_edit.php | 10 +++++----- user/ajax/ajax_expense_refund.php | 10 +++++----- user/ajax/ajax_file_move.php | 10 +++++----- user/ajax/ajax_file_rename.php | 10 +++++----- user/ajax/ajax_folder_rename.php | 10 +++++----- user/ajax/ajax_invoice_apply_credit.php | 4 ++-- user/ajax/ajax_invoice_copy.php | 10 +++++----- user/ajax/ajax_invoice_edit.php | 10 +++++----- user/ajax/ajax_invoice_pay.php | 4 ++-- user/ajax/ajax_item_edit.php | 10 +++++----- user/ajax/ajax_location_edit.php | 10 +++++----- user/ajax/ajax_network_edit.php | 10 +++++----- user/ajax/ajax_product_edit.php | 10 +++++----- user/ajax/ajax_project_edit.php | 10 +++++----- user/ajax/ajax_quote_copy.php | 10 +++++----- user/ajax/ajax_quote_edit.php | 10 +++++----- user/ajax/ajax_rack_device_add.php | 10 +++++----- user/ajax/ajax_rack_edit.php | 10 +++++----- user/ajax/ajax_recurring_expense_edit.php | 10 +++++----- user/ajax/ajax_recurring_invoice_edit.php | 10 +++++----- user/ajax/ajax_recurring_ticket_edit.php | 10 +++++----- user/ajax/ajax_revenue_edit.php | 10 +++++----- user/ajax/ajax_service_details.php | 8 ++++---- user/ajax/ajax_service_edit.php | 10 +++++----- user/ajax/ajax_software_edit.php | 10 +++++----- user/ajax/ajax_ticket_assign.php | 10 +++++----- user/ajax/ajax_ticket_billable.php | 10 +++++----- user/ajax/ajax_ticket_contact.php | 10 +++++----- user/ajax/ajax_ticket_edit.php | 10 +++++----- user/ajax/ajax_ticket_priority.php | 10 +++++----- user/ajax/ajax_ticket_reply_edit.php | 10 +++++----- user/ajax/ajax_ticket_reply_redact.php | 10 +++++----- user/ajax/ajax_ticket_task_edit.php | 10 +++++----- user/ajax/ajax_transfer_edit.php | 10 +++++----- user/ajax/ajax_trip_copy.php | 10 +++++----- user/ajax/ajax_trip_edit.php | 10 +++++----- user/ajax/ajax_vendor_details.php | 4 ++-- user/ajax/ajax_vendor_edit.php | 10 +++++----- user/asset_details.php | 2 +- user/assets.php | 2 +- user/calendar.php | 2 +- user/certificates.php | 2 +- user/client_documents.php | 2 +- user/client_files.php | 2 +- user/clients.php | 18 +++++++++--------- user/contacts.php | 2 +- user/credentials.php | 2 +- user/domains.php | 2 +- user/expenses.php | 2 +- user/global_search.php | 4 ++-- user/includes/inc_client_top_head.php | 8 ++++---- user/invoices.php | 2 +- user/locations.php | 2 +- user/modals/account_add_modal.php | 8 ++++---- user/modals/asset_add_modal.php | 8 ++++---- user/modals/asset_bulk_add_ticket_modal.php | 8 ++++---- .../modals/asset_bulk_assign_contact_modal.php | 8 ++++---- .../asset_bulk_assign_location_modal.php | 8 ++++---- ...set_bulk_assign_physical_location_modal.php | 8 ++++---- user/modals/asset_bulk_edit_status_modal.php | 8 ++++---- .../asset_bulk_transfer_client_modal.php | 8 ++++---- user/modals/asset_export_modal.php | 8 ++++---- user/modals/asset_import_modal.php | 8 ++++---- user/modals/asset_interface_add_modal.php | 8 ++++---- ...asset_interface_bulk_edit_network_modal.php | 8 ++++---- .../asset_interface_bulk_edit_type_modal.php | 8 ++++---- user/modals/asset_interface_export_modal.php | 8 ++++---- user/modals/asset_interface_import_modal.php | 8 ++++---- .../asset_interface_multiple_add_modal.php | 8 ++++---- user/modals/budget_create_modal.php | 8 ++++---- user/modals/budget_edit_modal.php | 8 ++++---- user/modals/calendar_add_modal.php | 8 ++++---- user/modals/calendar_event_add_modal.php | 8 ++++---- user/modals/certificate_add_modal.php | 8 ++++---- user/modals/certificate_export_modal.php | 8 ++++---- user/modals/{client => }/client_add.php | 0 user/modals/client_asset_documents_modal.php | 8 ++++---- .../{client => }/client_bulk_assign_tags.php | 8 ++++---- .../client_bulk_edit_hourly_rate.php | 8 ++++---- .../{client => }/client_bulk_edit_industry.php | 8 ++++---- .../{client => }/client_bulk_edit_referral.php | 8 ++++---- user/modals/{client => }/client_bulk_email.php | 8 ++++---- user/modals/{client => }/client_credit_add.php | 0 user/modals/{client => }/client_delete.php | 0 ...client_document_add_file_relation_modal.php | 8 ++++---- ...client_document_add_from_template_modal.php | 8 ++++---- user/modals/client_document_add_modal.php | 8 ++++---- .../modals/client_document_bulk_move_modal.php | 8 ++++---- .../client_document_link_asset_modal.php | 8 ++++---- .../client_document_link_contact_modal.php | 8 ++++---- .../modals/client_document_link_file_modal.php | 8 ++++---- .../client_document_link_software_modal.php | 8 ++++---- .../client_document_link_vendor_modal.php | 8 ++++---- .../{client => }/client_download_pdf.php | 8 ++++---- user/modals/{client => }/client_edit.php | 4 ++-- user/modals/{client => }/client_export.php | 8 ++++---- user/modals/client_file_bulk_move_modal.php | 8 ++++---- user/modals/client_file_link_asset_modal.php | 8 ++++---- user/modals/client_file_upload_modal.php | 8 ++++---- user/modals/client_file_view_modal.php | 2 +- user/modals/{client => }/client_import.php | 8 ++++---- user/modals/client_rack_add_modal.php | 8 ++++---- user/modals/client_recurring_export_modal.php | 8 ++++---- user/modals/contact_add_modal.php | 8 ++++---- user/modals/contact_archive_modal.php | 8 ++++---- .../contact_bulk_assign_location_modal.php | 8 ++++---- user/modals/contact_bulk_assign_tags_modal.php | 8 ++++---- .../contact_bulk_edit_department_modal.php | 8 ++++---- user/modals/contact_bulk_edit_phone_modal.php | 8 ++++---- user/modals/contact_bulk_edit_role_modal.php | 8 ++++---- user/modals/contact_bulk_email_modal.php | 8 ++++---- user/modals/contact_create_note_modal.php | 8 ++++---- user/modals/contact_export_modal.php | 8 ++++---- user/modals/contact_import_modal.php | 8 ++++---- user/modals/contact_invite_modal.php | 8 ++++---- user/modals/credential_add_modal.php | 8 ++++---- .../credential_bulk_assign_tags_modal.php | 8 ++++---- user/modals/credential_export_modal.php | 8 ++++---- user/modals/credential_import_modal.php | 8 ++++---- user/modals/custom_field_create_modal.php | 8 ++++---- user/modals/custom_field_edit_modal.php | 8 ++++---- user/modals/document_edit_visibility_modal.php | 8 ++++---- user/modals/domain_add_modal.php | 8 ++++---- user/modals/domain_export_modal.php | 8 ++++---- user/modals/expense_add_modal.php | 8 ++++---- .../modals/expense_bulk_edit_account_modal.php | 8 ++++---- .../expense_bulk_edit_category_modal.php | 8 ++++---- user/modals/expense_bulk_edit_client_modal.php | 8 ++++---- user/modals/expense_export_modal.php | 8 ++++---- user/modals/folder_create_modal.php | 8 ++++---- user/modals/invoice_add_modal.php | 8 ++++---- user/modals/invoice_add_ticket_modal.php | 6 +++--- .../invoice_bulk_edit_category_modal.php | 8 ++++---- user/modals/invoice_export_modal.php | 8 ++++---- user/modals/invoice_note_modal.php | 8 ++++---- user/modals/invoice_payment_add_bulk_modal.php | 8 ++++---- user/modals/invoice_recurring_add_modal.php | 6 +++--- user/modals/item_edit_modal.php | 8 ++++---- user/modals/location_add_modal.php | 8 ++++---- .../modals/location_bulk_assign_tags_modal.php | 8 ++++---- user/modals/location_export_modal.php | 8 ++++---- user/modals/location_import_modal.php | 8 ++++---- user/modals/network_add_modal.php | 8 ++++---- user/modals/network_export_modal.php | 8 ++++---- user/modals/payment_export_modal.php | 8 ++++---- user/modals/product_add_modal.php | 8 ++++---- .../product_bulk_edit_category_modal.php | 8 ++++---- user/modals/product_export_modal.php | 8 ++++---- user/modals/project_add_modal.php | 8 ++++---- .../project_link_closed_ticket_modal.php | 8 ++++---- user/modals/project_link_ticket_modal.php | 8 ++++---- user/modals/quote_add_modal.php | 8 ++++---- user/modals/quote_export_modal.php | 8 ++++---- user/modals/quote_note_modal.php | 8 ++++---- user/modals/quote_to_invoice_modal.php | 8 ++++---- user/modals/recurring_expense_create_modal.php | 8 ++++---- user/modals/recurring_invoice_add_modal.php | 8 ++++---- user/modals/recurring_invoice_note_modal.php | 8 ++++---- user/modals/recurring_payment_add_modal.php | 8 ++++---- user/modals/recurring_ticket_add_modal.php | 8 ++++---- user/modals/revenue_add_modal.php | 8 ++++---- user/modals/service_add_modal.php | 8 ++++---- user/modals/share_modal.php | 8 ++++---- .../software_add_from_template_modal.php | 8 ++++---- user/modals/software_add_modal.php | 8 ++++---- user/modals/software_export_modal.php | 8 ++++---- user/modals/ticket_add_modal.php | 8 ++++---- user/modals/ticket_add_modal_v2.php | 8 ++++---- user/modals/ticket_add_watcher_modal.php | 8 ++++---- user/modals/ticket_bulk_add_project_modal.php | 8 ++++---- user/modals/ticket_bulk_assign_modal.php | 8 ++++---- .../modals/ticket_bulk_edit_category_modal.php | 8 ++++---- .../modals/ticket_bulk_edit_priority_modal.php | 8 ++++---- user/modals/ticket_bulk_merge_modal.php | 8 ++++---- user/modals/ticket_bulk_reply_modal.php | 8 ++++---- user/modals/ticket_bulk_resolve_modal.php | 8 ++++---- user/modals/ticket_change_client_modal.php | 8 ++++---- user/modals/ticket_edit_asset_modal.php | 8 ++++---- user/modals/ticket_edit_schedule_modal.php | 8 ++++---- user/modals/ticket_edit_vendor_modal.php | 8 ++++---- user/modals/ticket_export_modal.php | 8 ++++---- user/modals/ticket_invoice_add_modal.php | 8 ++++---- user/modals/ticket_merge_modal.php | 8 ++++---- user/modals/top_nav_tickets_modal.php | 2 +- user/modals/transfer_add_modal.php | 8 ++++---- user/modals/trip_add_modal.php | 8 ++++---- user/modals/trip_export_modal.php | 8 ++++---- user/modals/user_mfa_modal.php | 8 ++++---- user/modals/vendor_add_from_template_modal.php | 8 ++++---- user/modals/vendor_add_modal.php | 8 ++++---- user/modals/vendor_contact_add_modal.php | 8 ++++---- user/modals/vendor_contact_edit_modal.php | 8 ++++---- user/modals/vendor_export_modal.php | 8 ++++---- user/networks.php | 2 +- user/post/client.php | 12 ++++++------ user/products.php | 2 +- user/project_details.php | 2 +- user/recurring_tickets.php | 2 +- user/tickets.php | 2 +- 328 files changed, 1210 insertions(+), 1202 deletions(-) rename {user => admin}/ajax/ajax_ai_model_edit.php (97%) rename {user => admin}/ajax/ajax_ai_provider_edit.php (96%) rename {user => admin}/ajax/ajax_category_add.php (86%) rename {user => admin}/ajax/ajax_category_edit.php (91%) rename {user => admin}/ajax/ajax_custom_link_edit.php (95%) rename {user => admin}/ajax/ajax_custom_ticket_status_edit.php (94%) rename {user => admin}/ajax/ajax_document_template_edit.php (90%) rename user/ajax/ajax_admin_mail_queue_message_view.php => admin/ajax/ajax_mail_queue_message_view.php (93%) rename {user => admin}/ajax/ajax_payment_method_edit.php (90%) rename {user => admin}/ajax/ajax_payment_provider_edit.php (96%) rename {user => admin}/ajax/ajax_role_edit.php (97%) rename {user => admin}/ajax/ajax_software_template_edit.php (95%) rename {user => admin}/ajax/ajax_tag_add.php (88%) rename {user => admin}/ajax/ajax_tag_edit.php (94%) rename {user => admin}/ajax/ajax_tax_edit.php (89%) rename {user => admin}/ajax/ajax_ticket_template_task_edit.php (92%) rename {user => admin}/ajax/ajax_user_edit.php (97%) rename {user => admin}/ajax/ajax_vendor_template_edit.php (98%) rename admin/{api.php => api_keys.php} (98%) rename admin/modals/{roles => }/role_add.php (94%) rename admin/modals/{roles => }/role_edit.php (97%) rename admin/modals/{users => }/user_add.php (97%) rename admin/modals/{users => }/user_all_reset_password.php (100%) rename admin/modals/{users => }/user_archive.php (100%) rename admin/modals/{users => }/user_edit.php (98%) rename admin/modals/{users => }/user_export.php (81%) rename admin/modals/{users => }/user_invite.php (92%) rename user/ajax/ajax_notifications.php => modals/notifications.php (92%) rename user/modals/{client => }/client_add.php (100%) rename user/modals/{client => }/client_bulk_assign_tags.php (92%) rename user/modals/{client => }/client_bulk_edit_hourly_rate.php (87%) rename user/modals/{client => }/client_bulk_edit_industry.php (87%) rename user/modals/{client => }/client_bulk_edit_referral.php (92%) rename user/modals/{client => }/client_bulk_email.php (96%) rename user/modals/{client => }/client_credit_add.php (100%) rename user/modals/{client => }/client_delete.php (100%) rename user/modals/{client => }/client_download_pdf.php (98%) rename user/modals/{client => }/client_edit.php (99%) rename user/modals/{client => }/client_export.php (81%) rename user/modals/{client => }/client_import.php (91%) diff --git a/admin/ai_model.php b/admin/ai_model.php index f2fb497d..758a76f3 100644 --- a/admin/ai_model.php +++ b/admin/ai_model.php @@ -111,4 +111,4 @@ $num_rows = mysqli_num_rows($sql); -
    +
    New Category
    -
    +
    Editing category:
    -
    +
    Editing link:
    -
    +
    Editing Ticket Status:
    -
    +
    @@ -69,11 +69,11 @@ ob_start();
    -
    +
    -
    +
    Editing template:
    -
    +
    @@ -37,11 +37,11 @@ ob_start();
    -
    +
    Tell your admin: Your role does not have admin access."); @@ -9,7 +9,7 @@ if (!isset($session_is_admin) || !$session_is_admin) { $email_id = intval($_GET['id']); //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../../plugins/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one @@ -73,7 +73,7 @@ ob_start();
    - + -
    +
    Editing:
    @@ -48,4 +48,4 @@ ob_start(); -
    +
    Editing:
    @@ -105,4 +105,4 @@ ob_start(); -
    +
    Editing role:
    -
    +
    Editing template:
    -
    +
    @@ -89,11 +89,11 @@ ob_start();
    -
    +
    Contact Tag --> -
    +
    New Tag
    -
    +
    @@ -39,11 +39,11 @@ $type = intval($_GET['id']);
    -
    +
    -
    +
    Editing tag:
    -
    +
    @@ -72,11 +72,11 @@ ob_start();
    -
    +
    -
    +
    Editing tax:
    -
    +
    Editing task
    @@ -59,4 +59,4 @@ ob_start(); -
    +
    Editing user:
    -
    +
    Editing vendor template:
    -
    +
    • @@ -244,11 +244,11 @@ ob_start();
    -
    +
    -
    - +
    -
    $client_name"; + $client_name_display = "$client_name"; } $log_entity_id = intval($row['log_entity_id']); @@ -292,11 +292,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    -
    -
    close(); - +
    @@ -120,12 +120,12 @@
    - +
    - + +
    -" > @@ -205,11 +205,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - +