diff --git a/CHANGELOG.md b/CHANGELOG.md index c723cb0e..a2b8ed9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ This file documents all notable changes made to ITFlow. +## [25.02.2] + +### Fixed +- Corrected some edit modals not showing notes correctly. +- Bugfix: When exporting to CSV, the first asset wasn't being shown. +- Fix broken create / edit credentials. +- Fixed missing Notificatons link. +- Fixed a few dead links. +- Fixed Overdue count also counting Non-Billable Invoices. +- Fix Edit Client Notes. + +### Added / Changed +- Implemented SSL certificate history tracking. +- Added Inactive / Active Filter to Recurring Invoices. +- Merged Dismissed notifications and notification in one. +- Added Link Button to addd / edit Document WYSIWYG. +- Added Physical location to the asset export / import. + ## [25.02.1] ### Fixed - Resolved broken links in the client overview, project and client listings, and rack details. @@ -24,33 +42,33 @@ This file documents all notable changes made to ITFlow. - Added a Vendor Quick Details Modal. - Enabled vendor linking and added a License Purchase Reference in the Software Licenses section. - Added download original, optimized and thumbnail option for images. -- Added Paid status to the top corner of Invoice PDFs +- Added Paid status to the top corner of Invoice PDFs. ## [25.02] ### Fixed -- Migrated several reports to the new permissions/roles system -- Resolved issue with empty task box showing for closed/resolved tickets -- Corrected ticket priority sorting -- Cloned asset interfaces when transferring assets between clients +- Migrated several reports to the new permissions/roles system. +- Resolved issue with empty task box showing for closed/resolved tickets. +- Corrected ticket priority sorting. +- Cloned asset interfaces when transferring assets between clients. ### Added / Changed - Restored max number of records per page option back to 500 since we dont have repeating modals. -- Bulk Categorize Tickets feature -- Renamed "Interface port" to "Interface Description." "Interface Name" should now refer to port name and/or number -- Changed "Transfer Asset to Client" from a single action to a bulk action -- Updated Filter Footer UI to show "Showing x to x of x records" instead of just the total records +- Bulk Categorize Tickets feature. +- Renamed "Interface port" to "Interface Description." "Interface Name" should now refer to port name and/or number. +- Changed "Transfer Asset to Client" from a single action to a bulk action. +- Updated Filter Footer UI to show "Showing x to x of x records" instead of just the total records. - Added Client Overview section to view client assets, contacts, licenses, credentials, etc. -- Introduced Quick Peek for asset details, contact information, and document viewing throughout the ITFlow App, all made possible by AJAX -- Enabled Simple Drag-and-Drop Ordering for Invoices, Recurring Invoices, Quotes, Ticket Tasks, and Ticket Template Tasks -- Added new Ticket View options: Kanban and Simple View -- Migrated all repeating modals to the new AJAX modal function for faster loading times and quicker development -- Allowed clients to upload PDF documents to accepted quotes -- Client Portal now shows ticket category -- Custom links can now be added to the Client Portal navbar +- Introduced Quick Peek for asset details, contact information, and document viewing throughout the ITFlow App, all made possible by AJAX. +- Enabled Simple Drag-and-Drop Ordering for Invoices, Recurring Invoices, Quotes, Ticket Tasks, and Ticket Template Tasks. +- Added new Ticket View options: Kanban and Simple View. +- Migrated all repeating modals to the new AJAX modal function for faster loading times and quicker development. +- Allowed clients to upload PDF documents to accepted quotes. +- Client Portal now shows ticket category. +- Custom links can now be added to the Client Portal navbar. - Lots of little tweaks to UI, performance, bugs, etc. ### Breaking Changes -- Cron scripts have officially been moved to the /scripts folder and are no longer in the root directory; they must be updated to function properly +- Cron scripts have officially been moved to the /scripts folder and are no longer in the root directory; they must be updated to function properly. ## [25.01.3] ### Fixed diff --git a/ajax/ajax_certificate_edit.php b/ajax/ajax_certificate_edit.php index 157675ec..3a9789b3 100644 --- a/ajax/ajax_certificate_edit.php +++ b/ajax/ajax_certificate_edit.php @@ -5,7 +5,7 @@ require_once '../includes/ajax_header.php'; $certificate_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_id = $certificate_id LIMIT 1"); - + $row = mysqli_fetch_array($sql); $certificate_name = nullable_htmlentities($row['certificate_name']); $certificate_description = nullable_htmlentities($row['certificate_description']); @@ -13,10 +13,13 @@ $certificate_domain = nullable_htmlentities($row['certificate_domain']); $certificate_domain_id = intval($row['certificate_domain_id']); $certificate_issued_by = nullable_htmlentities($row['certificate_issued_by']); $certificate_public_key = nullable_htmlentities($row['certificate_public_key']); +$certificate_notes = nullable_htmlentities($row['certificate_notes']); $certificate_expire = nullable_htmlentities($row['certificate_expire']); $certificate_created_at = nullable_htmlentities($row['certificate_created_at']); $client_id = intval($row['certificate_client_id']); +$history_sql = mysqli_query($mysqli, "SELECT * FROM certificate_history WHERE certificate_history_certificate_id = $certificate_id"); + // Generate the HTML form content using output buffering. ob_start(); ?> @@ -42,6 +45,9 @@ ob_start();
  • Notes
    • +
  • + History +
    • @@ -78,7 +84,7 @@ ob_start(); + +
    +
    + + + + + + + + + + + + + + + + + + + +
    DateFieldBeforeAfter
    +
    diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php index e67b8bee..77439c4e 100644 --- a/ajax/ajax_client_edit.php +++ b/ajax/ajax_client_edit.php @@ -251,9 +251,7 @@ ob_start();
    - +
    diff --git a/ajax/ajax_notifications.php b/ajax/ajax_notifications.php index 02ebac3b..dbb7e701 100644 --- a/ajax/ajax_notifications.php +++ b/ajax/ajax_notifications.php @@ -66,13 +66,17 @@ ob_start();
    + " class="btn btn-primary"> Dismiss all + + See all Notifications + - + See Dismissed Notifications diff --git a/database_updates.php b/database_updates.php index 6a74d7a0..50ea60ce 100644 --- a/database_updates.php +++ b/database_updates.php @@ -17,117 +17,6 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { // We need updates! - if (CURRENT_DATABASE_VERSION == '0.1.0') { - // Insert queries here required to update to DB version 0.1.1 - // Logs don't get archived - mysqli_query($mysqli, "ALTER TABLE `logs` DROP `log_archived_at`"); - - // Assets will eventualy have file associatons which could include a receipt. - mysqli_query($mysqli, "ALTER TABLE `assets` DROP `asset_reciept`"); - - mysqli_query($mysqli, "ALTER TABLE `campaign_messages` DROP `message_updated_at`"); - // This will be a seperate table eventually called contact_documents because contact can have several documents - mysqli_query($mysqli, "ALTER TABLE `documents` DROP `document_contact_id`"); - - mysqli_query($mysqli, "ALTER TABLE `expenses` DROP `expense_asset_id`"); - mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_contact_id`"); - mysqli_query($mysqli, "ALTER TABLE `history` DROP `history_archived_at`"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.1'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.1') { - // Insert queries here required to update to DB version 0.1.2 - // Create Many to Many Relationship tables for Assets, Contacts, Software and Vendors - - mysqli_query($mysqli, "CREATE TABLE `asset_documents` (`asset_id` int(11) NOT NULL,`document_id` int(11) NOT NULL, PRIMARY KEY (`asset_id`,`document_id`))"); - mysqli_query($mysqli, "CREATE TABLE `asset_logins` (`asset_id` int(11) NOT NULL,`login_id` int(11) NOT NULL, PRIMARY KEY (`asset_id`,`login_id`))"); - mysqli_query($mysqli, "CREATE TABLE `asset_files` (`asset_id` int(11) NOT NULL,`file_id` int(11) NOT NULL, PRIMARY KEY (`asset_id`,`file_id`))"); - - mysqli_query($mysqli, "CREATE TABLE `contact_documents` (`contact_id` int(11) NOT NULL,`document_id` int(11) NOT NULL, PRIMARY KEY (`contact_id`,`document_id`))"); - mysqli_query($mysqli, "CREATE TABLE `contact_logins` (`contact_id` int(11) NOT NULL,`login_id` int(11) NOT NULL, PRIMARY KEY (`contact_id`,`login_id`))"); - mysqli_query($mysqli, "CREATE TABLE `contact_files` (`contact_id` int(11) NOT NULL,`file_id` int(11) NOT NULL, PRIMARY KEY (`contact_id`,`file_id`))"); - - mysqli_query($mysqli, "CREATE TABLE `software_documents` (`software_id` int(11) NOT NULL,`document_id` int(11) NOT NULL, PRIMARY KEY (`software_id`,`document_id`))"); - mysqli_query($mysqli, "CREATE TABLE `software_logins` (`software_id` int(11) NOT NULL,`login_id` int(11) NOT NULL, PRIMARY KEY (`software_id`,`login_id`))"); - mysqli_query($mysqli, "CREATE TABLE `software_files` (`software_id` int(11) NOT NULL,`file_id` int(11) NOT NULL, PRIMARY KEY (`software_id`,`file_id`))"); - - mysqli_query($mysqli, "CREATE TABLE `vendor_documents` (`vendor_id` int(11) NOT NULL,`document_id` int(11) NOT NULL, PRIMARY KEY (`vendor_id`,`document_id`))"); - mysqli_query($mysqli, "CREATE TABLE `vendor_logins` (`vendor_id` int(11) NOT NULL,`login_id` int(11) NOT NULL, PRIMARY KEY (`vendor_id`,`login_id`))"); - mysqli_query($mysqli, "CREATE TABLE `vendor_files` (`vendor_id` int(11) NOT NULL,`file_id` int(11) NOT NULL, PRIMARY KEY (`vendor_id`,`file_id`))"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.2'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.2') { - // Insert queries here required to update to DB version 0.1.3 - mysqli_query($mysqli, "ALTER TABLE `logs` ADD `log_entity_id` INT NOT NULL DEFAULT '0' AFTER `log_user_id`"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.3'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.3') { - // Insert queries here required to update to DB version 0.1.4 - mysqli_query($mysqli, "ALTER TABLE assets ADD asset_status VARCHAR(200) NULL AFTER asset_mac"); - - ///Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.4'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.4') { - // Insert queries here required to update to DB version 0.1.5 - mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_txt` TEXT NULL DEFAULT NULL AFTER `domain_mail_servers`"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.5'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.5') { - // Insert queries here required to update to DB version 0.1.6 - // Remove Mailing List Tables - mysqli_query($mysqli, "DROP TABLE campaigns"); - mysqli_query($mysqli, "DROP TABLE campaign_messages"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.6'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.6') { - // Insert queries here required to update to DB version 0.1.7 - //Remove custom links - mysqli_query($mysqli, "DROP TABLE custom_links"); - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.7'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.7') { - // Insert queries here required to update to DB version 0.1.8 - mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_enable`"); - mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_path`"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.8'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.8') { - // Insert queries here required to update to DB version 0.1.9 - mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_base_url`"); - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.9'"); - } - - if (CURRENT_DATABASE_VERSION == '0.1.9') { - // Insert queries here required to update to DB version 0.2.0 - // Allow contacts to reset their portal password - mysqli_query($mysqli, "ALTER TABLE contacts ADD contact_password_reset_token VARCHAR(200) NULL DEFAULT NULL AFTER contact_password_hash"); - - // Then, update the database to the next sequential version - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.0'"); - } - if (CURRENT_DATABASE_VERSION == '0.2.0') { //Insert queries here required to update to DB version 0.2.1 @@ -2239,7 +2128,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.6.6') { - + mysqli_query($mysqli, "CREATE TABLE `contact_notes` ( `contact_note_id` INT(11) NOT NULL AUTO_INCREMENT, `contact_note_type` VARCHAR(200) NOT NULL, @@ -2280,7 +2169,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.6.7') { - + mysqli_query($mysqli, "CREATE TABLE `error_logs` ( `error_log_id` INT(11) NOT NULL AUTO_INCREMENT, `error_log_type` VARCHAR(200) NOT NULL, @@ -2304,7 +2193,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.6.8') { - + // Create New Vendor Templates Table this eventual be used to seperate templates out of the vendors table mysqli_query($mysqli, "CREATE TABLE `vendor_templates` (`vendor_template_id` int(11) AUTO_INCREMENT PRIMARY KEY, `vendor_template_name` varchar(200) NOT NULL, @@ -2322,7 +2211,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.6.9') { - + mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_has_thumbnail` TINYINT(1) NOT NULL DEFAULT 0 AFTER `file_mime_type`"); mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_has_preview` TINYINT(1) NOT NULL DEFAULT 0 AFTER `file_has_thumbnail`"); @@ -2330,7 +2219,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.7.0') { - + mysqli_query($mysqli, "DROP TABLE `vendor_templates`"); mysqli_query($mysqli, "CREATE TABLE `vendor_contacts` ( @@ -2348,12 +2237,12 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `vendor_contact_archived_at` DATETIME DEFAULT NULL, `vendor_contact_vendor_id` INT(11) NOT NULL DEFAULT 0 )"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.1'"); } if (CURRENT_DATABASE_VERSION == '1.7.1') { - + mysqli_query($mysqli, "DROP TABLE `error_logs`"); mysqli_query($mysqli, "CREATE TABLE `app_logs` ( @@ -2364,7 +2253,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `app_log_created_at` DATETIME NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`app_log_id`) )"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.2'"); } @@ -2377,7 +2266,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.7.3') { - + // Add Recurring Payments mysqli_query($mysqli, "CREATE TABLE `recurring_payments` ( `recurring_payment_id` INT(11) NOT NULL AUTO_INCREMENT, @@ -2397,7 +2286,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.7.4') { - + // Remove Recurring Payment Amount as it will use the Recurring Invoice Amount and is unessessary mysqli_query($mysqli, "ALTER TABLE `recurring_payments` DROP `recurring_payment_amount`"); @@ -2463,14 +2352,14 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.7.9') { - + mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_cron_key`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.0'"); } if (CURRENT_DATABASE_VERSION == '1.8.0') { - + mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_order` int(11) NOT NULL DEFAULT 0"); mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_order` int(11) NOT NULL DEFAULT 0"); @@ -2481,12 +2370,12 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); } - + if (CURRENT_DATABASE_VERSION == '1.8.1') { mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` CHANGE `interface_port` `interface_description` VARCHAR(200) DEFAULT NULL AFTER `interface_name`"); mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` ADD `interface_type` VARCHAR(50) DEFAULT NULL AFTER `interface_description`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.2'"); } @@ -2520,10 +2409,24 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.6'"); } - // if (CURRENT_DATABASE_VERSION == '1.8.6') { - // // Insert queries here required to update to DB version 1.8.7 + if (CURRENT_DATABASE_VERSION == '1.8.6') { + mysqli_query($mysqli, " + CREATE TABLE `certificate_history` (`certificate_history_id` INT(11) NOT NULL AUTO_INCREMENT, + `certificate_history_column` VARCHAR(200) NOT NULL, + `certificate_history_old_value` TEXT NOT NULL, + `certificate_history_new_value` TEXT NOT NULL, + `certificate_history_certificate_id` INT(11) NOT NULL, + `certificate_history_modified_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`certificate_history_id`)) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci; + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.7'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.8.7') { + // // Insert queries here required to update to DB version 1.8.8 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.7'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.8'"); // } } else { diff --git a/db.sql b/db.sql index 3431294a..a757b2a2 100644 --- a/db.sql +++ b/db.sql @@ -321,6 +321,24 @@ CREATE TABLE `categories` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `certificate_history` +-- + +DROP TABLE IF EXISTS `certificate_history`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `certificate_history` ( + `certificate_history_id` int(11) NOT NULL AUTO_INCREMENT, + `certificate_history_column` varchar(200) NOT NULL, + `certificate_history_old_value` text NOT NULL, + `certificate_history_new_value` text NOT NULL, + `certificate_history_certificate_id` int(11) NOT NULL, + `certificate_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`certificate_history_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `certificates` -- diff --git a/includes/app_version.php b/includes/app_version.php index 9d4a8fb8..3675c435 100644 --- a/includes/app_version.php +++ b/includes/app_version.php @@ -5,4 +5,4 @@ * Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month. */ -DEFINE("APP_VERSION", "25.02.1"); +DEFINE("APP_VERSION", "25.02.2"); diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 6610214c..134d9cb3 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -202,7 +202,7 @@ 0) { ?> - +

    diff --git a/includes/database_version.php b/includes/database_version.php index dfc04fee..17de9b8e 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.8.6"); +DEFINE("LATEST_DATABASE_VERSION", "1.8.7"); diff --git a/invoices.php b/invoices.php index aaf133bb..8eadd522 100644 --- a/invoices.php +++ b/invoices.php @@ -33,7 +33,7 @@ $draft_count = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled' $client_query")); $cancelled_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE() $client_query")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_status NOT LIKE 'Non-Billable' AND invoice_due < CURDATE() $client_query")); $overdue_count = $row['num']; $sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft' $client_query"); diff --git a/js/app.js b/js/app.js index 6e6527da..c751288c 100644 --- a/js/app.js +++ b/js/app.js @@ -28,6 +28,7 @@ tinymce.init({ toolbar: [ { name: 'styles', items: [ 'styles' ] }, { name: 'formatting', items: [ 'bold', 'italic', 'forecolor' ] }, + { name: 'link', items: [ 'link'] }, { name: 'lists', items: [ 'bullist', 'numlist' ] }, { name: 'alignment', items: [ 'alignleft', 'aligncenter', 'alignright', 'alignjustify' ] }, { name: 'indentation', items: [ 'outdent', 'indent' ] }, @@ -59,6 +60,7 @@ tinymce.init({ toolbar: [ { name: 'styles', items: [ 'styles' ] }, { name: 'formatting', items: [ 'bold', 'italic', 'forecolor' ] }, + { name: 'link', items: [ 'link'] }, { name: 'lists', items: [ 'bullist', 'numlist' ] }, { name: 'alignment', items: [ 'alignleft', 'aligncenter', 'alignright', 'alignjustify' ] }, { name: 'indentation', items: [ 'outdent', 'indent' ] }, @@ -275,20 +277,6 @@ tinymce.init({ } }); -// Initialize TinyMCE -tinymce.init({ - selector: '.tinymcePreview', - resize: false, - promotion: false, - branding: false, - menubar: false, - toolbar: false, - statusbar: false, - readonly: false, - plugins: 'autoresize', - license_key: 'gpl', -}); - // DateTime $('.datetimepicker').datetimepicker({ }); diff --git a/modals/asset_import_modal.php b/modals/asset_import_modal.php index 512958e9..25dc0deb 100644 --- a/modals/asset_import_modal.php +++ b/modals/asset_import_modal.php @@ -14,7 +14,7 @@
    -

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location

    +

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location, Physical Location

    diff --git a/notifications.php b/notifications.php index af75852c..283e4ad8 100644 --- a/notifications.php +++ b/notifications.php @@ -1,76 +1,159 @@ -
    -
    -

    Notifications

    -
    - - 0) { ?>Dismiss All - Dismissed -
    +
    +
    +

    + Notifications +

    +
    + + Dismissed + + Dismissed +
    -
    - 0) { ?> - -
    - - - - - - - - - - - - $client_name"; - } - - ?> - - - - - - - - - - - - -
    TimestampTypeNotificationClientDismiss
    -
    -
    - - -
    -

    No Notifications

    -
    - -
    +
    +
    + + + +
    +
    +
    + Notifications"> +
    + + +
    +
    +
    +
    + + +
    +
    +
    " id="advancedFilter"> +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Timestamp + + + + Type + + + + Notification + + + + Dismissed At + + + 0) { ?> + " + class="btn btn-sm btn-dark mb-2" title="Dismiss All"> + + + +
    +
    + +
    +
    - -
    -
    -

    Dismissed Notications

    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    " id="advancedFilter"> -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - - "> - - - - - - - - - - $client_name"; - } - - ?> - - - - - - - - - - -
    - - Timestamp - - - - Type - - - - Notification - - - - Client - - - - Dismissed At - -
    -
    - -
    -
    - - 0) { @@ -924,12 +926,12 @@ if (isset($_POST['export_assets_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial Number', 'Operating System', 'Purchase Date', 'Warranty Expire', 'Install Date', 'Assigned To', 'Location', 'Notes'); + $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial Number', 'Operating System', 'Purchase Date', 'Warranty Expire', 'Install Date', 'Assigned To', 'Location', 'Physical Location', 'Notes'); fputcsv($f, $fields, $delimiter); //output each row of the data, format line as csv and write to file pointer - while($row = mysqli_fetch_array($sql)) { - $lineData = array($row['asset_name'], $row['asset_description'], $row['asset_type'], $row['asset_make'], $row['asset_model'], $row['asset_serial'], $row['asset_os'], $row['asset_purchase_date'], $row['asset_warranty_expire'], $row['asset_install_date'], $row['contact_name'], $row['location_name'], $row['asset_notes']); + while ($row = mysqli_fetch_array($sql)) { + $lineData = array($row['asset_name'], $row['asset_description'], $row['asset_type'], $row['asset_make'], $row['asset_model'], $row['asset_serial'], $row['asset_os'], $row['asset_purchase_date'], $row['asset_warranty_expire'], $row['asset_install_date'], $row['contact_name'], $row['location_name'], $row['asset_physical_location'], $row['asset_notes']); fputcsv($f, $lineData, $delimiter); } @@ -1188,7 +1190,6 @@ if (isset($_GET['delete_asset_interface'])) { if (isset($_POST["import_client_asset_interfaces_csv"])) { enforceUserPermission('module_support', 2); - validateCSRFToken($_POST['csrf_token']); $asset_id = intval($_POST['asset_id']); @@ -1338,7 +1339,6 @@ if (isset($_GET['download_client_asset_interfaces_csv_template'])) { if (isset($_POST['export_client_asset_interfaces_csv'])) { enforceUserPermission('module_support'); - validateCSRFToken($_POST['csrf_token']); $asset_id = intval($_POST['asset_id']); diff --git a/post/user/certificate.php b/post/user/certificate.php index 2fe0a469..f2960904 100644 --- a/post/user/certificate.php +++ b/post/user/certificate.php @@ -64,8 +64,41 @@ if (isset($_POST['edit_certificate'])) { $expire = "'" . $expire . "'"; } + // Get current certificate info + $original_certificate_info = mysqli_fetch_assoc(mysqli_query($mysqli," + SELECT + certificates.*, + domains.domain_name + FROM certificates + LEFT JOIN domains ON certificate_domain_id = domain_id + WHERE certificate_id = $certificate_id + ")); + + // Update certificate mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_description = '$description', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = '$domain_id' WHERE certificate_id = $certificate_id"); + // Fetch the updated info + $new_certificate_info = mysqli_fetch_assoc(mysqli_query($mysqli," + SELECT + certificates.*, + domains.domain_name + FROM certificates + LEFT JOIN domains ON certificate_domain_id = domain_id + WHERE certificate_id = $certificate_id + ")); + + // Compare/log changes between old/new info + $ignored_columns = ["certificate_public_key", "certificate_updated_at", "certificate_accessed_at", "certificate_domain_id"]; + foreach ($original_certificate_info as $column => $old_value) { + $new_value = $new_certificate_info[$column]; + if ($old_value != $new_value && !in_array($column, $ignored_columns)) { + $column = sanitizeInput($column); + $old_value = sanitizeInput($old_value); + $new_value = sanitizeInput($new_value); + mysqli_query($mysqli,"INSERT INTO certificate_history SET certificate_history_column = '$column', certificate_history_old_value = '$old_value', certificate_history_new_value = '$new_value', certificate_history_certificate_id = $certificate_id"); + } + } + // Logging logAction("Certificate", "Edit", "$session_name edited certificate $name", $client_id, $certificate_id); @@ -144,7 +177,7 @@ if (isset($_POST['bulk_delete_certificates'])) { $client_id = intval($row['certificate_client_id']); mysqli_query($mysqli, "DELETE FROM certificates WHERE certificate_id = $certificate_id AND certificate_client_id = $client_id"); - + // Logging logAction("Certificate", "Delete", "$session_name deleted certificate $certificate_name", $client_id); diff --git a/post/user/credential.php b/post/user/credential.php index 18d6c6ea..ac6f899c 100644 --- a/post/user/credential.php +++ b/post/user/credential.php @@ -12,7 +12,7 @@ if (isset($_POST['add_login'])) { require_once 'post/user/credential_model.php'; - mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_asset_id = $asset_id, login_client_id = $client_id"); $login_id = mysqli_insert_id($mysqli); @@ -50,7 +50,7 @@ if (isset($_POST['edit_login'])) { } // Update the login entry with the new details - mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_asset_id = $asset_id WHERE login_id = $login_id"); // Tags // Delete existing tags diff --git a/recurring_invoices.php b/recurring_invoices.php index a94f1f24..a7f79656 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -18,8 +18,14 @@ if (isset($_GET['client_id'])) { // Perms enforceUserPermission('module_sales'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); +// Status Filter +if (isset($_GET['status']) && $_GET['status'] == "inactive") { + $status_filter = "inactive"; + $status_query = "AND recurring_status = 0"; +} else { + $status_filter = "active"; + $status_query = "AND recurring_status = 1"; +} $sql = mysqli_query( $mysqli, @@ -29,6 +35,7 @@ $sql = mysqli_query( LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id WHERE (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') AND DATE(recurring_created_at) BETWEEN '$dtf' AND '$dtt' + $status_query $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); @@ -49,6 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
    @@ -60,7 +68,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    +
    + ">Active + ">Inactive +
    diff --git a/report_clients_with_balance.php b/report_clients_with_balance.php index f9fc7bad..40f15ce7 100644 --- a/report_clients_with_balance.php +++ b/report_clients_with_balance.php @@ -66,7 +66,7 @@ enforceUserPermission('module_financial'); ?> - + $old_value) { + $new_value = $new_certificate_info[$column]; + if ($old_value != $new_value && !in_array($column, $ignored_columns)) { + $column = sanitizeInput($column); + $old_value = sanitizeInput($old_value); + $new_value = sanitizeInput($new_value); + mysqli_query($mysqli,"INSERT INTO certificate_history SET certificate_history_column = '$column', certificate_history_old_value = '$old_value', certificate_history_new_value = '$new_value', certificate_history_certificate_id = $certificate_id"); + } + } + } else { logApp("Cron-Certificate-Refresher", "error", "Cron Certificate Refresh - error updating Error updating $domain."); error_log("Certificate Cron Error - Error updating $domain");