Better error handling for undefined/non-existent asset IDs

- bugfix .eml not being generated
- include the message when notifying the tech of a reply

.gitignore

@@ -34,5 +34,14 @@ client/custom/*
 !client/custom/readme.php
 guest/custom/*
 !guest/custom/readme.php
+cron/custom/*
+!cron/custom/readme.php
+scripts/custom/*
+!scripts/custom/readme.php
+setup/custom/*
+!setup/custom/readme.php
+api/v1/custom/*
+!api/v1/custom/readme.php
 .zed
 
+

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [25.10.1]
+- Deprecation Notice: `/scripts/cron_mail_queue.php` , `/scripts/cron_ticket_email_parser.php` , `/scripts/cron.php` `/scripts/cron_domain_refresher.php`, `/scripts/cron_certificate_refresher.php` are being phased out. Please transition to `/cron/mail_queue.php` , `/cron/ticket_email_parser.php`, `/cron/cron.php`, `/cron/domain_refresher.php`, `/cron/certificate_refresher.php` These older scripts will be removed in the November 25.11 release—update accordingly. 25.10.1 installs have the script already configured.
+
+### Fixes
+- Fix regression missing custom Favicon.
+- Update SMTP and IMAP provider to allow for empty strings, empty means disabled.
+- Fix Client portal Microsoft SSO Logins.
+- Fix regression in Vendor Templates.
+- Fix refression in some broken links from user to agent.
+- Fix Project edit.
+- Prevent open redirects upon agent login.
+- Fix regression on switching to Webklex IMAP to allow for no SSL/TLS in IMAP.
+- Fix Setup Redirect not behaving properly when setup hasnt been performed.
+- Added Server Document Root Var to several includes, headers, footers files to allow includes from deeper directory strutures such as the new custom directories.
+- Fix edit contact in contact details.
+- Add .htaccess to /cron/.
+
+### Added / Changed
+- Support for HTML Signatures.
+- Add Edit Project Functionality in a ticket.
+- Added more custom locations: /cron/custom/, /scripts/custom/, /api/v1/custom/, /setup/custom/.
+- Copied `/scripts/cron.php` `/scripts/cron_domain_refresher.php`, `/scripts/cron_certificate_refresher.php` to `/cron/cron.php`, `/cron/domain_refresher.php`, `/cron/certificate_refresher.php`. See Above!
+- Signatures is now handled in post ticket reply on Public Comments only.
+
 ## [25.10]
 
 ### Breaking Changes

admin/app_log.php

@@ -97,34 +97,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

admin/audit_log.php

@@ -159,34 +159,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

admin/database_updates.php

@@ -4027,10 +4027,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.5'");
     }
     
-    // if (CURRENT_DATABASE_VERSION == '2.3.4') {
-    //     // Insert queries here required to update to DB version 2.3.4
+    if (CURRENT_DATABASE_VERSION == '2.3.5') {
+        mysqli_query($mysqli, "ALTER TABLE `settings` CHANGE `config_smtp_provider` `config_smtp_provider` VARCHAR(200) DEFAULT NULL");
+        mysqli_query($mysqli, "ALTER TABLE `settings` CHANGE `config_imap_provider` `config_imap_provider` VARCHAR(200) DEFAULT NULL");
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
+    }
+
+    // if (CURRENT_DATABASE_VERSION == '2.3.5') {
+    //     // Insert queries here required to update to DB version 2.3.5
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.5'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
     // }
 
 } else {

admin/includes/inc_all_admin.php

@@ -1,16 +1,16 @@
 <?php
 
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
 if (!isset($session_is_admin) || !$session_is_admin) {
     exit(WORDING_ROLECHECK_FAILED . "<br>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";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once 'includes/side_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/app_version.php';

admin/includes/side_nav.php

@@ -1,6 +1,6 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
-    <a class="brand-link pb-1 mt-1" href="../agent/<?php echo $config_start_page ?>">
+    <a class="brand-link pb-1 mt-1" href="/agent/<?php echo $config_start_page ?>">
         <p class="h6">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text">
@@ -14,21 +14,27 @@
         <!-- Sidebar Menu -->
         <nav>
             <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
-                <!-- ACCESS Section -->
+                <li class="nav-header">ACCESS</li>
                 <li class="nav-item">
-                    <a href="users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "users.php") {echo "active";} ?>">
+                    <a href="/admin/users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "users.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-users"></i>
                         <p>Users</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="roles.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "roles.php") {echo "active";} ?>">
+                    <a href="/admin/roles.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "roles.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-user-shield"></i>
                         <p>Roles</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="api_keys.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "api_keys.php") {echo "active";} ?>">
+                    <a href="/admin/modules.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "modules.php") {echo "active";} ?>">
+                        <i class="nav-icon fas fa-puzzle-piece"></i>
+                        <p>Modules</p>
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a href="/admin/api_keys.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "api_keys.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-key"></i>
                         <p>API Keys</p>
                     </a>
@@ -36,51 +42,51 @@
                 <li class="nav-header">TAGS & CATEGORIES</li>
 
                 <li class="nav-item">
-                    <a href="tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tag.php' ? 'active' : ''); ?>">
+                    <a href="/admin/tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tag.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-tags"></i>
                         <p>Tags</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'category.php' ? 'active' : ''); ?>">
+                    <a href="/admin/category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'category.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-list-ul"></i>
                         <p>Categories</p>
                     </a>
                 </li>
                 <?php if ($config_module_enable_accounting) { ?>
                     <li class="nav-item">
-                        <a href="tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax.php' ? 'active' : ''); ?>">
+                        <a href="/admin/tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-balance-scale"></i>
                             <p>Taxes</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_method.php' ? 'active' : ''); ?>">
+                        <a href="/admin/payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_method.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Payment Methods</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
+                        <a href="/admin/payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Payment Providers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'saved_payment_method.php' ? 'active' : ''); ?>">
+                        <a href="/admin/saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'saved_payment_method.php' ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Saved Payments</p>
                         </a>
                     </li>
                 <?php } ?>
                     <li class="nav-item">
-                        <a href="ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
+                        <a href="/admin/ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Providers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_model.php' ? 'active' : ''); ?>">
+                        <a href="/admin/ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_model.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Models</p>
                         </a>
@@ -88,14 +94,14 @@
                 
                 <?php if ($config_module_enable_ticketing) { ?>
                     <li class="nav-item">
-                        <a href="ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
+                        <a href="/admin/ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-info-circle"></i>
                             <p>Ticket Statuses</p>
                         </a>
                     </li>
                 <?php } ?>
                 <li class="nav-item">
-                    <a href="custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_link.php' ? 'active' : ''); ?>">
+                    <a href="/admin/custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_link.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-external-link-alt"></i>
                         <p>Custom Links</p>
                     </a>
@@ -105,31 +111,31 @@
                     <li class="nav-header">TEMPLATES</li>
 
                     <li class="nav-item">
-                        <a href="project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>Project Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Ticket Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendor Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-rocket"></i>
                             <p>License Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file"></i>
                             <p>Document Templates</p>
                         </a>
@@ -139,37 +145,37 @@
                 <li class="nav-header">MAINTENANCE</li>
 
                 <li class="nav-item">
-                    <a href="mail_queue.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'mail_queue.php' ? 'active' : ''); ?>">
+                    <a href="/admin/mail_queue.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'mail_queue.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-mail-bulk"></i>
                         <p>Mail Queue</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'audit_log.php' ? 'active' : ''); ?>">
+                    <a href="/admin/audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'audit_log.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>Audit Logs</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'app_log.php' ? 'active' : ''); ?>">
+                    <a href="/admin/app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'app_log.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>App Logs</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="backup.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'backup.php' ? 'active' : ''); ?>">
+                    <a href="/admin/backup.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'backup.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-cloud-upload-alt"></i>
                         <p>Backup</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="debug.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'debug.php' ? 'active' : ''); ?>">
+                    <a href="/admin/debug.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'debug.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-bug"></i>
                         <p>Debug</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="update.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'update.php' ? 'active' : ''); ?>">
+                    <a href="/admin/update.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'update.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-download"></i>
                         <p>Update</p>
                     </a>
@@ -185,56 +191,56 @@
                     </a>
                     <ul class="nav nav-treeview">
                         <li class="nav-item">
-                            <a href="settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_company.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_company.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-briefcase"></i>
                                 <p>Company Details</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_localization.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_localization.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-globe"></i>
                                 <p>Localization</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_theme.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_theme.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-paint-brush"></i>
                                 <p>Theme</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_security.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_security.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-shield-alt"></i>
                                 <p>Security</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_mail.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_mail.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-envelope"></i>
                                 <p>Mail</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_notification.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_notification.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-bell"></i>
                                 <p>Notifications</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_default.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_default.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cogs"></i>
                                 <p>Defaults</p>
                             </a>
                         </li>
                         <?php if ($config_module_enable_accounting) { ?>
                             <li class="nav-item">
-                                <a href="settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_invoice.php' ? 'active' : ''); ?>">
+                                <a href="/admin/settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_invoice.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-file-invoice"></i>
                                     <p>Invoice</p>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a href="settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_quote.php' ? 'active' : ''); ?>">
+                                <a href="/admin/settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_quote.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-comment-dollar"></i>
                                     <p>Quote</p>
                                 </a>
@@ -242,13 +248,13 @@
                         <?php } ?>
                         <?php if ($config_module_enable_ticketing) { ?>
                             <li class="nav-item">
-                                <a href="settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_project.php' ? 'active' : ''); ?>">
+                                <a href="/admin/settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_project.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-project-diagram"></i>
                                     <p>Project</p>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a href="settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ticket.php' ? 'active' : ''); ?>">
+                                <a href="/admin/settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ticket.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-life-ring"></i>
                                     <p>Ticket</p>
                                 </a>
@@ -257,20 +263,20 @@
                         <!-- Currently the only integration is the client portal SSO -->
                         <?php if ($config_client_portal_enable) { ?>
                             <li class="nav-item">
-                                <a href="identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'identity_provider.php' ? 'active' : ''); ?>">
+                                <a href="/admin/identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'identity_provider.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-fingerprint"></i>
                                     <p>Identity Provider</p>
                                 </a>
                             </li>
                         <?php } ?>
                         <li class="nav-item">
-                            <a href="settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_telemetry.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_telemetry.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-satellite-dish"></i>
                                 <p>Telemetry</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_module.php' ? 'active' : ''); ?>">
+                            <a href="/admin/settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_module.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cube"></i>
                                 <p>Modules</p>
                             </a>

admin/mail_queue.php

@@ -53,34 +53,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

admin/modules.php

@@ -0,0 +1,113 @@
+<?php
+
+// Default Column Sortby Filter
+$sort = "module_name";
+$order = "DESC";
+
+require_once "includes/inc_all_admin.php";
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM modules
+    WHERE (module_name LIKE '%$q%' OR module_description LIKE '%$q%')
+    ORDER BY $sort $order LIMIT $record_from, $record_to"
+);
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+?>
+
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-puzzle-piece mr-2"></i>Access Modules</h3>
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/module/module_add.php">
+                    <i class="fas fa-fw fa-plus mr-2"></i>New Module
+                </button>
+            </div>
+        </div>
+    </div>
+    <div class="card-body">
+        <form class="mb-4" autocomplete="off">
+            <div class="row">
+                <div class="col-md-4">
+                    <div class="input-group">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo stripslashes(nullable_htmlentities($q));} ?>" placeholder="Search Modules">
+                        <div class="input-group-append">
+                            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap">
+                <tr>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=module_name&order=<?php echo $disp; ?>">
+                            Module <?php if ($sort == 'module_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $module_id = intval($row['module_id']);
+                    $module_name = nullable_htmlentities($row['module_name']);
+                    $module_description = nullable_htmlentities($row['module_description']);
+
+                    ?>
+                    <tr>
+                        <td>
+                            <a href="#" <?php if ($module_id > 6) { ?> class="ajax-modal" data-modal-url="modals/modules/module_edit.php?id=<?= $module_id ?>" <?php } ?>>
+                                <strong class="text-dark"><?= $module_name ?></strong>
+                            </a>
+                            <div class="text-secondary"><?= $module_description ?></div>
+                        </td>
+                        <td>
+                            <?php if ($module_id > 6) { ?>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/module/module_edit.php?id=<?= $module_id ?>">
+                                            <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
+                                        </a>
+
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger confirm-link" href="post.php?delete_module=<?= $module_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
+                                            <i class="fas fa-fw fa-archive mr-2"></i>Delete
+                                        </a>
+
+                                    </div>
+                                </div>
+                            <?php } else { echo "<p class='text-center'>N/A Predefined</p>"; } ?>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once "../includes/filter_footer.php";
+        ?>
+    </div>
+</div>
+
+<?php
+
+require_once "../includes/footer.php";

admin/post/backup.php

@@ -2,185 +2,304 @@
 
 /*
  * ITFlow - GET/POST request handler for DB / master key backup
+ * Rewritten with streaming SQL dump, component checksums, safer zipping, and better headers.
  */
 
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
 require_once "../includes/app_version.php";
 
-if (isset($_GET['download_backup'])) {
-    
-    validateCSRFToken($_GET['csrf_token']);
-    
-    $timestamp = date('YmdHis');
-    $baseName = "itflow_$timestamp";
+// --- Optional performance levers for big backups ---
+@set_time_limit(0);
+if (function_exists('ini_set')) {
+    @ini_set('memory_limit', '1024M');
+}
 
-    // === 0. Scoped cleanup ===
-    $cleanupFiles = [];
+/**
+ * Write a line to a file handle with newline.
+ */
+function fwrite_ln($fh, string $s): void {
+    fwrite($fh, $s);
+    fwrite($fh, PHP_EOL);
+}
 
-    $registerTempFileForCleanup = function ($file) use (&$cleanupFiles) {
-        $cleanupFiles[] = $file;
-    };
-
-    register_shutdown_function(function () use (&$cleanupFiles) {
-        foreach ($cleanupFiles as $file) {
-            if (is_file($file)) {
-                @unlink($file);
-            }
-        }
-    });
-
-    // === 1. Local helper function: zipFolder
-    $zipFolder = function ($folderPath, $zipFilePath) {
-        $zip = new ZipArchive();
-        if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) !== TRUE) {
-            error_log("Failed to open zip file: $zipFilePath");
-            http_response_code(500);
-            exit("Internal Server Error: Cannot open zip archive.");
-        }
-
-        $folderPath = realpath($folderPath);
-        if (!$folderPath) {
-            error_log("Invalid folder path: $folderPath");
-            http_response_code(500);
-            exit("Internal Server Error: Invalid folder path.");
-        }
-
-        $files = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($folderPath),
-            RecursiveIteratorIterator::LEAVES_ONLY
-        );
-
-        foreach ($files as $file) {
-            if (!$file->isDir()) {
-                $filePath = $file->getRealPath();
-                $relativePath = substr($filePath, strlen($folderPath) + 1);
-                $zip->addFile($filePath, $relativePath);
-            }
-        }
-
-        $zip->close();
-    };
-
-    // === 2. Create all temp files
-    $sqlFile = tempnam(sys_get_temp_dir(), $baseName . "_sql_");
-    $uploadsZip = tempnam(sys_get_temp_dir(), $baseName . "_uploads_");
-    $versionFile = tempnam(sys_get_temp_dir(), $baseName . "_version_");
-    $finalZip = tempnam(sys_get_temp_dir(), $baseName . "_backup_");
-
-    foreach ([$sqlFile, $uploadsZip, $versionFile, $finalZip] as $f) {
-        $registerTempFileForCleanup($f);
-        chmod($f, 0600);
+/**
+ * Stream a SQL dump of schema and data into $sqlFile.
+ * - Tables first (DROP + CREATE + INSERTs)
+ * - Views (DROP VIEW + CREATE VIEW)
+ * - Triggers (DROP TRIGGER + CREATE TRIGGER)
+ *
+ * NOTE: Routines/events are not dumped here. Add if needed.
+ */
+function dump_database_streaming(mysqli $mysqli, string $sqlFile): void {
+    $fh = fopen($sqlFile, 'wb');
+    if (!$fh) {
+        http_response_code(500);
+        exit("Cannot open dump file");
     }
 
-    // === 3. Generate SQL Dump
-    $sqlContent = "-- UTF-8 + Foreign Key Safe Dump\n";
-    $sqlContent .= "SET NAMES 'utf8mb4';\n";
-    $sqlContent .= "SET foreign_key_checks = 0;\n\n";
+    // Preamble
+    fwrite_ln($fh, "-- UTF-8 + Foreign Key Safe Dump");
+    fwrite_ln($fh, "SET NAMES 'utf8mb4';");
+    fwrite_ln($fh, "SET FOREIGN_KEY_CHECKS = 0;");
+    fwrite_ln($fh, "SET UNIQUE_CHECKS = 0;");
+    fwrite_ln($fh, "SET AUTOCOMMIT = 0;");
+    fwrite_ln($fh, "");
 
+    // Gather tables and views
     $tables = [];
-    $res = $mysqli->query("SHOW TABLES");
+    $views  = [];
+
+    $res = $mysqli->query("SHOW FULL TABLES");
     if (!$res) {
-        error_log("MySQL Error: " . $mysqli->error);
+        fclose($fh);
+        error_log("MySQL Error (SHOW FULL TABLES): " . $mysqli->error);
+        http_response_code(500);
         exit("Error retrieving tables.");
     }
+    while ($row = $res->fetch_array(MYSQLI_NUM)) {
+        $name = $row[0];
+        $type = strtoupper($row[1] ?? '');
+        if ($type === 'VIEW') {
+            $views[] = $name;
+        } else {
+            $tables[] = $name;
+        }
+    }
+    $res->close();
 
-    while ($row = $res->fetch_row()) {
-        $tables[] = $row[0];
+    // --- TABLES: structure and data ---
+    foreach ($tables as $table) {
+        $createRes = $mysqli->query("SHOW CREATE TABLE `{$mysqli->real_escape_string($table)}`");
+        if (!$createRes) {
+            error_log("MySQL Error (SHOW CREATE TABLE $table): " . $mysqli->error);
+            // continue to next table
+            continue;
+        }
+        $createRow = $createRes->fetch_assoc();
+        $createSQL = array_values($createRow)[1] ?? '';
+        $createRes->close();
+
+        fwrite_ln($fh, "-- ----------------------------");
+        fwrite_ln($fh, "-- Table structure for `{$table}`");
+        fwrite_ln($fh, "-- ----------------------------");
+        fwrite_ln($fh, "DROP TABLE IF EXISTS `{$table}`;");
+        fwrite_ln($fh, $createSQL . ";");
+        fwrite_ln($fh, "");
+
+        // Dump data in a streaming fashion
+        $dataRes = $mysqli->query("SELECT * FROM `{$mysqli->real_escape_string($table)}`", MYSQLI_USE_RESULT);
+        if ($dataRes) {
+            $wroteHeader = false;
+            while ($row = $dataRes->fetch_assoc()) {
+                if (!$wroteHeader) {
+                    fwrite_ln($fh, "-- Dumping data for table `{$table}`");
+                    $wroteHeader = true;
+                }
+                $cols = array_map(fn($c) => '`' . $mysqli->real_escape_string($c) . '`', array_keys($row));
+                $vals = array_map(
+                    function ($v) use ($mysqli) {
+                        return is_null($v) ? "NULL" : "'" . $mysqli->real_escape_string($v) . "'";
+                    },
+                    array_values($row)
+                );
+                fwrite_ln($fh, "INSERT INTO `{$table}` (" . implode(", ", $cols) . ") VALUES (" . implode(", ", $vals) . ");");
+            }
+            $dataRes->close();
+            if ($wroteHeader) fwrite_ln($fh, "");
+        }
     }
 
-    foreach ($tables as $table) {
-        $createRes = $mysqli->query("SHOW CREATE TABLE `$table`");
-        if (!$createRes) {
-            error_log("MySQL Error: " . $mysqli->error);
+    // --- VIEWS ---
+    foreach ($views as $view) {
+        $escView = $mysqli->real_escape_string($view);
+        $cRes = $mysqli->query("SHOW CREATE VIEW `{$escView}`");
+        if ($cRes) {
+            $row = $cRes->fetch_assoc();
+            $createView = $row['Create View'] ?? '';
+            $cRes->close();
+
+            fwrite_ln($fh, "-- ----------------------------");
+            fwrite_ln($fh, "-- View structure for `{$view}`");
+            fwrite_ln($fh, "-- ----------------------------");
+            fwrite_ln($fh, "DROP VIEW IF EXISTS `{$view}`;");
+            // Ensure statement ends with semicolon
+            if (!str_ends_with($createView, ';')) $createView .= ';';
+            fwrite_ln($fh, $createView);
+            fwrite_ln($fh, "");
+        }
+    }
+
+    // --- TRIGGERS ---
+    $tRes = $mysqli->query("SHOW TRIGGERS");
+    if ($tRes) {
+        while ($t = $tRes->fetch_assoc()) {
+            $triggerName = $t['Trigger'];
+            $escTrig = $mysqli->real_escape_string($triggerName);
+            $crt = $mysqli->query("SHOW CREATE TRIGGER `{$escTrig}`");
+            if ($crt) {
+                $row = $crt->fetch_assoc();
+                $createTrig = $row['SQL Original Statement'] ?? ($row['Create Trigger'] ?? '');
+                $crt->close();
+
+                fwrite_ln($fh, "-- ----------------------------");
+                fwrite_ln($fh, "-- Trigger for `{$triggerName}`");
+                fwrite_ln($fh, "-- ----------------------------");
+                fwrite_ln($fh, "DROP TRIGGER IF EXISTS `{$triggerName}`;");
+                if (!str_ends_with($createTrig, ';')) $createTrig .= ';';
+                fwrite_ln($fh, $createTrig);
+                fwrite_ln($fh, "");
+            }
+        }
+        $tRes->close();
+    }
+
+    // Postamble
+    fwrite_ln($fh, "SET FOREIGN_KEY_CHECKS = 1;");
+    fwrite_ln($fh, "SET UNIQUE_CHECKS = 1;");
+    fwrite_ln($fh, "COMMIT;");
+
+    fclose($fh);
+}
+
+/**
+ * Zip a folder to $zipFilePath, skipping symlinks and dot-entries.
+ */
+function zipFolderStrict(string $folderPath, string $zipFilePath): void {
+    $zip = new ZipArchive();
+    if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) !== TRUE) {
+        error_log("Failed to open zip file: $zipFilePath");
+        http_response_code(500);
+        exit("Internal Server Error: Cannot open zip archive.");
+    }
+
+    $folderReal = realpath($folderPath);
+    if (!$folderReal || !is_dir($folderReal)) {
+        // Create an empty archive if uploads folder doesn't exist yet
+        $zip->close();
+        return;
+    }
+
+    $files = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator($folderReal, FilesystemIterator::SKIP_DOTS),
+        RecursiveIteratorIterator::LEAVES_ONLY
+    );
+
+    foreach ($files as $file) {
+        /** @var SplFileInfo $file */
+        if ($file->isDir()) continue;
+        if ($file->isLink()) continue; // skip symlinks
+        $filePath = $file->getRealPath();
+        if ($filePath === false) continue;
+
+        // ensure path is inside the folder boundary
+        if (strpos($filePath, $folderReal . DIRECTORY_SEPARATOR) !== 0 && $filePath !== $folderReal) {
             continue;
         }
 
-        $createRow = $createRes->fetch_assoc();
-        $createSQL = array_values($createRow)[1];
-
-        $sqlContent .= "\n-- ----------------------------\n";
-        $sqlContent .= "-- Table structure for `$table`\n";
-        $sqlContent .= "-- ----------------------------\n";
-        $sqlContent .= "DROP TABLE IF EXISTS `$table`;\n";
-        $sqlContent .= $createSQL . ";\n\n";
-
-        $dataRes = $mysqli->query("SELECT * FROM `$table`");
-        if ($dataRes && $dataRes->num_rows > 0) {
-            $sqlContent .= "-- Dumping data for table `$table`\n";
-            while ($row = $dataRes->fetch_assoc()) {
-                $columns = array_map(fn($col) => '`' . $mysqli->real_escape_string($col) . '`', array_keys($row));
-                $values = array_map(function ($val) use ($mysqli) {
-                    return is_null($val) ? "NULL" : "'" . $mysqli->real_escape_string($val) . "'";
-                }, array_values($row));
-                $sqlContent .= "INSERT INTO `$table` (" . implode(", ", $columns) . ") VALUES (" . implode(", ", $values) . ");\n";
-            }
-            $sqlContent .= "\n";
-        }
+        $relativePath = substr($filePath, strlen($folderReal) + 1);
+        $zip->addFile($filePath, $relativePath);
     }
 
-    $sqlContent .= "SET foreign_key_checks = 1;\n";
-    file_put_contents($sqlFile, $sqlContent);
+    $zip->close();
+}
 
-    // === 4. Zip the uploads folder
-    $zipFolder("../uploads", $uploadsZip);
+if (isset($_GET['download_backup'])) {
 
-    // === 5. Create version.txt
-    $commitHash = trim(shell_exec('git log -1 --format=%H')) ?: 'N/A';
-    $gitBranch = trim(shell_exec('git rev-parse --abbrev-ref HEAD')) ?: 'N/A';
+    validateCSRFToken($_GET['csrf_token']);
 
-    $versionContent = "ITFlow Backup Metadata\n";
+    $timestamp   = date('YmdHis');
+    $baseName    = "itflow_{$timestamp}";
+    $downloadName = $baseName . ".zip";
+
+    // === Scoped cleanup of temp files ===
+    $cleanupFiles = [];
+    $registerTempFileForCleanup = function ($file) use (&$cleanupFiles) {
+        $cleanupFiles[] = $file;
+    };
+    register_shutdown_function(function () use (&$cleanupFiles) {
+        foreach ($cleanupFiles as $file) {
+            if (is_file($file)) { @unlink($file); }
+        }
+    });
+
+    // === Create temp files ===
+    $sqlFile     = tempnam(sys_get_temp_dir(), $baseName . "_sql_");
+    $uploadsZip  = tempnam(sys_get_temp_dir(), $baseName . "_uploads_");
+    $versionFile = tempnam(sys_get_temp_dir(), $baseName . "_version_");
+    $finalZip    = tempnam(sys_get_temp_dir(), $baseName . "_backup_");
+
+    foreach ([$sqlFile, $uploadsZip, $versionFile, $finalZip] as $f) {
+        $registerTempFileForCleanup($f);
+        @chmod($f, 0600);
+    }
+
+    // === Generate SQL Dump (streaming) ===
+    dump_database_streaming($mysqli, $sqlFile);
+
+    // === Zip the uploads folder (strict) ===
+    zipFolderStrict("../uploads", $uploadsZip);
+
+    // === Gather metadata & checksums ===
+    $commitHash = (function_exists('shell_exec') ? trim(shell_exec('git log -1 --format=%H 2>/dev/null')) : '') ?: 'N/A';
+    $gitBranch  = (function_exists('shell_exec') ? trim(shell_exec('git rev-parse --abbrev-ref HEAD 2>/dev/null')) : '') ?: 'N/A';
+
+    $dbSha = hash_file('sha256', $sqlFile) ?: 'N/A';
+    $upSha = hash_file('sha256', $uploadsZip) ?: 'N/A';
+
+    $versionContent  = "ITFlow Backup Metadata\n";
     $versionContent .= "-----------------------------\n";
     $versionContent .= "Generated: " . date('Y-m-d H:i:s') . "\n";
-    $versionContent .= "Backup File: " . basename($finalZip) . "\n";
-    $versionContent .= "Generated By: $session_name\n";
+    $versionContent .= "Backup File: " . $downloadName . "\n";
+    $versionContent .= "Generated By: " . ($session_name ?? 'Unknown User') . "\n";
     $versionContent .= "Host: " . gethostname() . "\n";
     $versionContent .= "Git Branch: $gitBranch\n";
     $versionContent .= "Git Commit: $commitHash\n";
     $versionContent .= "ITFlow Version: " . (defined('APP_VERSION') ? APP_VERSION : 'Unknown') . "\n";
     $versionContent .= "Database Version: " . (defined('CURRENT_DATABASE_VERSION') ? CURRENT_DATABASE_VERSION : 'Unknown') . "\n";
-    $versionContent .= "Checksum (SHA256): \n";
+    $versionContent .= "Checksums (SHA256):\n";
+    $versionContent .= "  db.sql: $dbSha\n";
+    $versionContent .= "  uploads.zip: $upSha\n";
 
     file_put_contents($versionFile, $versionContent);
+    @chmod($versionFile, 0600);
 
-    // === 6. Build final ZIP
+    // === Build final ZIP ===
     $final = new ZipArchive();
     if ($final->open($finalZip, ZipArchive::CREATE | ZipArchive::OVERWRITE) !== TRUE) {
         error_log("Failed to create final zip: $finalZip");
         http_response_code(500);
         exit("Internal Server Error: Unable to create backup archive.");
     }
-
     $final->addFile($sqlFile, "db.sql");
     $final->addFile($uploadsZip, "uploads.zip");
     $final->addFile($versionFile, "version.txt");
     $final->close();
 
-    chmod($finalZip, 0600);
+    @chmod($finalZip, 0600);
 
-    $checksum = hash_file('sha256', $finalZip);
-    file_put_contents($versionFile, $versionContent . "$checksum\n");
-
-    // === 7. Serve final ZIP
+    // === Serve final ZIP with a stable filename ===
     header('Content-Type: application/zip');
-    header('Content-Disposition: attachment; filename="' . basename($finalZip) . '"');
+    header('X-Content-Type-Options: nosniff');
+    header('Content-Disposition: attachment; filename="' . $downloadName . '"');
     header('Content-Length: ' . filesize($finalZip));
     header('Pragma: public');
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Content-Transfer-Encoding: binary');
 
+    // Push file
     flush();
     $fp = fopen($finalZip, 'rb');
     fpassthru($fp);
     fclose($fp);
 
-    logAction("System", "Backup Download", "$session_name downloaded full backup.");
+    // Log + UX
+    logAction("System", "Backup Download", ($session_name ?? 'Unknown User') . " downloaded full backup.");
     flash_alert("Full backup downloaded.");
     exit;
 }
 
-
 if (isset($_POST['backup_master_key'])) {
 
     validateCSRFToken($_POST['csrf_token']);

admin/post/settings_mail.php

@@ -6,7 +6,7 @@ if (isset($_POST['edit_mail_smtp_settings'])) {
     
     validateCSRFToken($_POST['csrf_token']);
 
-    $config_smtp_provider            = sanitizeInput($_POST['config_smtp_provider'] ?? 'standard_smtp');
+    $config_smtp_provider            = sanitizeInput($_POST['config_smtp_provider']);
     $config_smtp_host                = sanitizeInput($_POST['config_smtp_host']);
     $config_smtp_port                = intval($_POST['config_smtp_port'] ?? 0);
     $config_smtp_encryption          = sanitizeInput($_POST['config_smtp_encryption']);
@@ -22,7 +22,7 @@ if (isset($_POST['edit_mail_smtp_settings'])) {
 
     mysqli_query($mysqli, "
         UPDATE settings SET
-            config_smtp_provider              = " . ($config_smtp_provider === 'none' ? "NULL" : "'$config_smtp_provider'") . ",
+            config_smtp_provider              = '$config_smtp_provider',
             config_smtp_host                  = '$config_smtp_host',
             config_smtp_port                  = $config_smtp_port,
             config_smtp_encryption            = '$config_smtp_encryption',
@@ -48,7 +48,7 @@ if (isset($_POST['edit_mail_imap_settings'])) {
     
     validateCSRFToken($_POST['csrf_token']);
 
-    $config_imap_provider            = sanitizeInput($_POST['config_imap_provider'] ?? 'standard_imap');
+    $config_imap_provider            = sanitizeInput($_POST['config_imap_provider']);
     $config_imap_host                = sanitizeInput($_POST['config_imap_host']);
     $config_imap_port                = intval($_POST['config_imap_port'] ?? 0);
     $config_imap_encryption          = sanitizeInput($_POST['config_imap_encryption']);
@@ -64,7 +64,7 @@ if (isset($_POST['edit_mail_imap_settings'])) {
 
     mysqli_query($mysqli, "
         UPDATE settings SET
-            config_imap_provider              = " . ($config_imap_provider === 'none' ? "NULL" : "'$config_imap_provider'") . ",
+            config_imap_provider              = '$config_imap_provider',
             config_imap_host                  = '$config_imap_host',
             config_imap_port                  = $config_imap_port,
             config_imap_encryption            = '$config_imap_encryption',

admin/post/ticket_template.php

@@ -5,8 +5,8 @@
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
 // Import shared code from user-side tickets/tasks as we reuse functions
-require_once '../user/post/ticket.php';
-require_once '../user/post/task.php';
+require_once '../agent/post/ticket.php';
+require_once '../agent/post/task.php';
 
 if (isset($_POST['add_ticket_template'])) {
 

admin/post/vendor_template.php

@@ -5,7 +5,7 @@
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
 // Import shared code from user-side vendor management  as we reuse functions
-require_once '../user/post/vendor.php';
+require_once '../agent/post/vendor.php';
 
 if (isset($_POST['add_vendor_template'])) {
 

admin/settings_mail.php

@@ -18,10 +18,10 @@ require_once "includes/inc_all_admin.php";
                             <span class="input-group-text"><i class="fa fa-fw fa-cloud"></i></span>
                         </div>
                         <select class="form-control" name="config_smtp_provider" id="config_smtp_provider">
-                            <option value="none" <?php if(($config_smtp_provider ?? '')==='none' || ($config_smtp_provider ?? '')==='') echo 'selected'; ?>>None (Disabled)</option>
-                            <option value="standard_smtp" <?php if(($config_smtp_provider ?? 'standard_smtp')==='standard_smtp') echo 'selected'; ?>>Standard SMTP (Username/Password)</option>
-                            <option value="google_oauth" <?php if(($config_smtp_provider ?? '')==='google_oauth') echo 'selected'; ?>>Google Workspace (OAuth)</option>
-                            <option value="microsoft_oauth" <?php if(($config_smtp_provider ?? '')==='microsoft_oauth') echo 'selected'; ?>>Microsoft 365 (OAuth)</option>
+                            <option value="" <?php if(empty($config_smtp_provider)) { echo 'selected'; } ?>>None (Disabled)</option>
+                            <option value="standard_smtp" <?php if($config_smtp_provider === 'standard_smtp') { echo 'selected'; } ?>>Standard SMTP (Username/Password)</option>
+                            <option value="google_oauth" <?php if($config_smtp_provider === 'google_oauth') { echo 'selected'; } ?>>Google Workspace (OAuth)</option>
+                            <option value="microsoft_oauth" <?php if($config_smtp_provider === 'microsoft_oauth') { echo 'selected'; } ?>>Microsoft 365 (OAuth)</option>
                         </select>
                     </div>
                     <small class="text-secondary d-block mt-1" id="smtp_provider_hint">
@@ -116,10 +116,10 @@ require_once "includes/inc_all_admin.php";
                             <span class="input-group-text"><i class="fa fa-fw fa-cloud"></i></span>
                         </div>
                         <select class="form-control" name="config_imap_provider" id="config_imap_provider">
-                            <option value="none" <?php if($config_imap_provider ==='') echo 'selected'; ?>>None (Disabled)</option>
-                            <option value="standard_imap" <?php if(($config_imap_provider ?? 'standard_imap')==='standard_imap') echo 'selected'; ?>>Standard IMAP (Username/Password)</option>
-                            <option value="google_oauth" <?php if(($config_imap_provider ?? '')==='google_oauth') echo 'selected'; ?>>Google Workspace (OAuth)</option>
-                            <option value="microsoft_oauth" <?php if(($config_imap_provider ?? '')==='microsoft_oauth') echo 'selected'; ?>>Microsoft 365 (OAuth)</option>
+                            <option value="" <?php if(empty($config_imap_provider)) { echo 'selected'; } ?>>None (Disabled)</option>
+                            <option value="standard_imap" <?php if($config_imap_provider === 'standard_imap') { echo 'selected'; } ?>>Standard IMAP (Username/Password)</option>
+                            <option value="google_oauth" <?php if($config_imap_provider === 'google_oauth') { echo 'selected'; } ?>>Google Workspace (OAuth)</option>
+                            <option value="microsoft_oauth" <?php if($config_imap_provider === 'microsoft_oauth') { echo 'selected'; } ?>>Microsoft 365 (OAuth)</option>
                         </select>
                     </div>
                     <small class="text-secondary d-block mt-1" id="imap_provider_hint">

admin/ticket_template.php

@@ -8,10 +8,15 @@ require_once "includes/inc_all_admin.php";
 
 $sql = mysqli_query(
     $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM ticket_templates
-    WHERE (ticket_template_name LIKE '%$q%' OR ticket_template_description LIKE '%$q%')
-    AND ticket_template_archived_at IS NULL
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
+    "SELECT SQL_CALC_FOUND_ROWS *, 
+            COUNT(task_template_id) AS task_count
+     FROM ticket_templates
+     LEFT JOIN task_templates ON task_template_ticket_template_id = ticket_template_id
+     WHERE (ticket_template_name LIKE '%$q%' OR ticket_template_description LIKE '%$q%')
+     AND ticket_template_archived_at IS NULL
+     GROUP BY ticket_template_id
+     ORDER BY $sort $order 
+     LIMIT $record_from, $record_to"
 );
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -46,14 +51,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <hr>
         <div class="table-responsive-sm">
             <table class="table table-striped table-borderless table-hover">
-                <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
+                <thead class="text-dark <?php if($num_rows[0] == 0) { echo "d-none"; } ?>">
                 <tr>
                     <th>
-                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_template_name&order=<?php echo $disp; ?>">
+                        <a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=ticket_template_name&order=<?= $disp ?>">
                             Template <?php if ($sort == 'ticket_template_name') { echo $order_icon; } ?>
                         </a>
                     </th>
-                    <th>Tasks</th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=task_count&order=<?php echo $disp; ?>">
+                            Tasks <?php if ($sort == 'task_count') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th class="text-center">Action</th>
                 </tr>
                 </thead>
@@ -66,6 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $ticket_template_description = nullable_htmlentities($row['ticket_template_description']);
                     $ticket_template_subject = nullable_htmlentities($row['ticket_template_subject']);
                     $ticket_template_created_at = nullable_htmlentities($row['ticket_template_created_at']);
+                    $task_count = intval($row['task_count']);
 
                     ?>
                     <tr>
@@ -75,23 +85,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
                                     <div class="media-body">
                                         <div>
-                                            <a href="ticket_template_details.php?ticket_template_id=<?php echo $ticket_template_id; ?>">
-                                                <?php echo $ticket_template_name; ?>
+                                            <a href="ticket_template_details.php?ticket_template_id=<?= $ticket_template_id ?>">
+                                                <?= $ticket_template_name ?>
                                             </a>
                                         </div>
-                                        <div><small class="text-secondary"><?php echo $ticket_template_description; ?></small></div>
+                                        <div><small class="text-secondary"><?= $ticket_template_description ?></small></div>
                                     </div>
                                 </div>
                             </a>
                         </td>
-                        <td>0</td>
+                        <td><?= $task_count ?></td>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" data-toggle="dropdown">
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_ticket_template=<?php echo $ticket_template_id; ?>">
+                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_ticket_template=<?= $ticket_template_id ?>">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </a>
                                 </div>
@@ -112,4 +122,3 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/ticket_template/ticket_template_add.php";
 require_once "../includes/footer.php";
-

admin/update.php

@@ -56,8 +56,6 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                         <p class="text-center font-weight-bold">Ignore this warning at your own risk.</p>
                     </div>
 
-                    <a class="btn btn-primary btn-lg my-4 confirm-link" href="post.php?no"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>TEST</h5></a>
-
                     <a class="btn btn-primary btn-lg my-4 confirm-link" href="post.php?update"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update App</h5></a>
                     <a class="btn btn-danger btn-lg confirm-link" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-hammer mb-1"></i><h5>FORCE Update App</h5></a>
 

agent/ajax.php

@@ -675,3 +675,27 @@ if (isset($_POST['update_recurring_invoice_items_order'])) {
     echo json_encode(['status' => 'success']);
     exit;
 }
+
+if (isset($_GET['client_duplicate_check'])) {
+    enforceUserPermission('module_client', 2);
+
+    $name = sanitizeInput($_GET['name']);
+
+    $response['message'] = ""; // default
+
+    if (strlen($name) >= 5) {
+        $sql_clients = mysqli_query($mysqli, "SELECT client_name FROM clients
+        WHERE client_archived_at IS NULL
+        AND client_name LIKE '%$name%'
+        ORDER BY client_id DESC LIMIT 1"
+        );
+
+        if (mysqli_num_rows($sql_clients) > 0) {
+            while ($row = mysqli_fetch_array($sql_clients)) {
+                $response['message'] = "<i class='fas fa-fw fa-copy mr-2'></i> Potential duplicate: <i>" . nullable_htmlentities($row['client_name']) . "</i> already exists.";
+            }
+        }
+    }
+
+    echo json_encode($response);
+}

agent/assets.php

@@ -37,17 +37,23 @@ enforceUserPermission('module_support');
 //Asset Type from GET
 if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
     $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";
+    $type_filter = "workstation";
 } elseif (isset($_GET['type']) && ($_GET['type']) == 'server') {
     $type_query = "asset_type = 'server'";
+    $type_filter = "server";
 } elseif (isset($_GET['type']) && ($_GET['type']) == 'virtual') {
     $type_query = "asset_type = 'Virtual Machine'";
+    $type_filter = "virtual";
 } elseif (isset($_GET['type']) && ($_GET['type']) == 'network') {
     $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'";
+    $type_filter = "network";
 } elseif (isset($_GET['type']) && ($_GET['type']) == 'other') {
     $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'";
+    $type_filter = "other";
 } else {
     $type_query = "asset_type LIKE '%'";
     $_GET['type'] = '';
+    $type_filter = '';
 }
 
 if (!$client_url) {
@@ -133,19 +139,6 @@ $sql = mysqli_query(
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
-
-// OS typeahead suggestions
-$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL");
-if ($os_sql && mysqli_num_rows($os_sql) > 0) {
-    $os_arr = [];
-    while ($row = mysqli_fetch_assoc($os_sql)) {
-        // jQuery UI Autocomplete expects {label: "...", value: "..."}
-        $label = $row['label'];
-        $os_arr[] = ['label' => $label, 'value' => $label];
-    }
-    $json_os = json_encode($os_arr);
-}
-
 ?>
 
 <div class="col-sm-12 mb-3">
@@ -185,8 +178,8 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) {
         <div class="card-tools">
             <?php if (lookupUserPermission("module_support") >= 2) { ?>
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetModal">
-                    <i class="fas fa-plus mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/asset/asset_add.php?<?= $client_url ?>&type=<?= $type_filter ?>">
+                    <i class="fas fa-plus mr-2"></i>New <?php if ($type_filter) { echo ucwords($type_filter); } else { echo "Asset"; } ?>
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
@@ -716,24 +709,7 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) {
 
 <script src="../js/bulk_actions.js"></script>
 
-<!-- JSON Autocomplete / type ahead -->
-<link rel="stylesheet" href="../plugins/jquery-ui/jquery-ui.min.css">
-<script src="../plugins/jquery-ui/jquery-ui.min.js"></script>
-<script>
-    $(function() {
-        var operatingSystems = <?php echo $json_os; ?>;
-        $("#os").autocomplete({
-            source: operatingSystems,  // Should be an array of objects with 'label' and 'value'
-            select: function(event, ui) {
-                $("#os").val(ui.item.label); // Set the input field value to the selected label
-                return false;
-            }
-        });
-    });
-</script>
-
 <?php
-require_once "modals/asset/asset_add.php";
 require_once "modals/asset/asset_export.php";
 if ($client_url) {
     require_once "modals/asset/asset_import.php";

agent/budget.php

@@ -1,113 +0,0 @@
-<?php
-
-require_once "includes/inc_all.php";
-
-// Perms
-enforceUserPermission('module_financial');
-
-// Fetch categories
-$query = "SELECT category_id, category_name FROM categories WHERE category_type ='Expense' AND category_archived_at IS NULL";
-$result = mysqli_query($mysqli, $query);
-$categories = [];
-while($row = mysqli_fetch_assoc($result)) {
-    $categories[] = $row;
-}
-
-// Fetch years with budget
-$query = "SELECT DISTINCT budget_year FROM budget ORDER BY budget_year ASC";
-$result = mysqli_query($mysqli, $query);
-$years = [];
-while ($row = mysqli_fetch_assoc($result)) {
-    $years[] = $row['budget_year'];
-}
-
-// Fetch current year budgets
-$currentYear = date("Y");
-if (isset($_GET['year'])) {
-    $currentYear = intval($_GET['year']);
-}
-
-$query = "SELECT * FROM budget WHERE budget_year = $currentYear";
-$result = mysqli_query($mysqli, $query);
-$budgets = [];
-while ($row = mysqli_fetch_assoc($result)) {
-    $budgets[] = $row;
-}
-
-$months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-$columnTotals = array_fill(0, 12, 0);
-$grandTotal = 0;
-
-?>
-<div class="card card-dark">
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Budget for <span id="currentYear"><?php echo $currentYear; ?></span></h3>
-        <div class="card-tools">
-            <a href="budget_edit.php" class="btn btn-primary">
-                <i class="fas fa-edit mr-2"></i>Edit Budget
-            </a>
-        </div>
-    </div>
-    <div class="card-body">
-    <form id="yearForm" method="GET" action="budget.php">
-        <div class="form-group">
-            <select class="form-control" name="year" id="yearSelect" onchange="submit();">
-                <?php foreach ($years as $year): ?>
-                    <option value="<?php echo $year; ?>" <?php if ($year == $currentYear) { echo 'selected'; } ?>><?php echo $year; ?></option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-    </form>
-    <table class="table table-bordered table-striped">
-        <thead>
-        <tr>
-            <th>Expense</th>
-            <?php foreach ($months as $month): ?>
-                <th><?php echo $month; ?></th>
-            <?php endforeach; ?>
-            <th>Total</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($categories as $category): ?>
-            <tr>
-                <td><?php echo nullable_htmlentities($category['category_name']); ?></td>
-                <?php
-                $rowTotal = 0;
-                foreach ($months as $index => $month):
-                    $amount = getBudgetAmount($budgets, $category['category_id'], $index + 1);
-                    $rowTotal += $amount;
-                    $columnTotals[$index] += $amount;
-                ?>
-                    <td><?php echo $amount; ?></td>
-                <?php endforeach; ?>
-                <td><?php echo $rowTotal; ?></td>
-            </tr>
-        <?php
-        $grandTotal += $rowTotal;
-        endforeach; ?>
-        </tbody>
-        <tfoot>
-        <tr>
-            <th>Total</th>
-            <?php foreach ($columnTotals as $total): ?>
-                <th><?php echo $total; ?></th>
-            <?php endforeach; ?>
-            <th><?php echo $grandTotal; ?></th>
-        </tr>
-        </tfoot>
-    </table>
-</div>
-
-<?php
-function getBudgetAmount($budgets, $categoryId, $month) {
-    foreach ($budgets as $budget) {
-        if ($budget['budget_category_id'] == $categoryId && $budget['budget_month'] == $month) {
-            return intval($budget['budget_amount']);
-        }
-    }
-    return 0;
-}
-
-require_once "../includes/footer.php";
-?>

agent/budget_edit.php

@@ -1,114 +0,0 @@
-<?php
-
-require_once "includes/inc_all.php";
-
-enforceUserPermission('module_financial', 2);
-
-// Fetch categories
-$query = "SELECT category_id, category_name FROM categories WHERE category_type ='Expense' AND category_archived_at IS NULL";
-$result = mysqli_query($mysqli, $query);
-$categories = [];
-while($row = mysqli_fetch_assoc($result)) {
-    $categories[] = $row;
-}
-
-// Fetch current year budgets
-$currentYear = date("Y");
-if(isset($_GET['year'])) {
-    $currentYear = intval($_GET['year']);
-}
-
-$query = "SELECT * FROM budget WHERE budget_year = $currentYear";
-$result = mysqli_query($mysqli, $query);
-$budgets = [];
-while($row = mysqli_fetch_assoc($result)) {
-    $budgets[] = $row;
-}
-
-$months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-$columnTotals = array_fill(0, 12, 0);
-$grandTotal = 0;
-
-?>
-<div class="card card-dark">
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Editing Budget for <span id="currentYear"><?php echo $currentYear; ?></span></h3>
-        <div class="card-tools">
-            <a href="budget.php" class="btn btn-default text-dark">
-                <i class="fas fa-eye mr-2"></i>View Budget
-            </a>
-            <button type="submit" name="save_budget" form="budgetForm" class="btn btn-primary"><i class="fas fa-fw fa-check mr-2"></i>Save Budget</button>
-            <button type="submit" name="delete_budget" form="budgetForm" class="btn btn-danger"><i class="fas fa-fw fa-trash mr-2"></i>Delete Budget</button>
-        </div>
-    </div>
-    <div class="card-body">
-    
-    <form id="yearForm" method="GET" action="budget.php">
-        <div class="form-group">
-            <select class="form-control" name="year" id="yearSelect" onchange="submit();">
-                <?php for ($i = $currentYear - 10; $i <= $currentYear + 5; $i++): ?>
-                    <option value="<?php echo $i; ?>" <?php if ($i == $currentYear) echo 'selected'; ?>><?php echo $i; ?></option>
-                <?php endfor; ?>
-            </select>
-        </div>
-    </form>
-    <form id="budgetForm" method="POST" action="post.php">
-        <input type="hidden" name="year" value="<?php echo $currentYear; ?>">
-        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-        <table class="table table-bordered table-striped">
-            <thead>
-            <tr>
-                <th>Expense</th>
-                <?php foreach ($months as $month): ?>
-                    <th><?php echo $month; ?></th>
-                <?php endforeach; ?>
-                <th>Total</th>
-            </tr>
-            </thead>
-            <tbody>
-            <?php foreach ($categories as $category): ?>
-                <tr>
-                    <td><?php echo nullable_htmlentities($category['category_name']); ?></td>
-                    <?php
-                    $rowTotal = 0;
-                    foreach ($months as $index => $month):
-                        $amount = getBudgetAmount($budgets, $category['category_id'], $index + 1);
-                        $rowTotal += $amount;
-                        $columnTotals[$index] += $amount;
-                    ?>
-                        <td><input type='text' inputmode='numeric' pattern='[0-9]*' class="form-control" name="budget[<?php echo intval($category['category_id']); ?>][<?php echo $index + 1; ?>]" value="<?php echo $amount; ?>"></td>
-                    <?php endforeach; ?>
-                    <td><?php echo $rowTotal; ?></td>
-                </tr>
-            <?php
-            $grandTotal += $rowTotal;
-            endforeach; ?>
-            </tbody>
-            <tfoot>
-            <tr>
-                <th>Total</th>
-                <?php foreach ($columnTotals as $total): ?>
-                    <th><?php echo $total; ?></th>
-                <?php endforeach; ?>
-                <th><?php echo $grandTotal; ?></th>
-            </tr>
-            </tfoot>
-        </table>
-    </form>
-    </div>
-
-</div>
-
-<?php
-function getBudgetAmount($budgets, $categoryId, $month) {
-    foreach ($budgets as $budget) {
-        if ($budget['budget_category_id'] == $categoryId && $budget['budget_month'] == $month) {
-            return intval($budget['budget_amount']);
-        }
-    }
-    return 0;
-}
-
-require_once "../includes/footer.php";
-?>

agent/clients.php

@@ -86,7 +86,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
             <?php if (lookupUserPermission("module_client") >= 2) { ?>
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal">
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/client/client_add.php<?php if ($leads_filter) { echo "?lead=1"; } ?>">
                         <i class="fas fa-plus mr-2"></i>New
                         <?php if ($leads_filter == 0) { echo "Client"; } else { echo "Lead"; } ?>
                     </button>
@@ -137,6 +137,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-layer-group"></i><span class="d-none d-sm-inline ml-2">Action</span> (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                        <i class="fas fa-fw fa-life-ring mr-2"></i>Open Tickets
+                                    </a>
+                                    <div class="dropdown-divider"></div>
                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditHourlyRateModal">
                                         <i class="fas fa-fw fa-clock mr-2"></i>Set Hourly Rate
                                     </a>
@@ -178,49 +182,27 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <div 
                 class="collapse 
                     <?php 
-                    if (
-                    isset($_GET['dtf'])
-                    || $industry_filter
-                    || $referral_filter
-                    || (isset($_GET['tags']) && is_array($_GET['tags']))
-                    || $_GET['canned_date'] !== "custom" ) 
-                    { 
-                        echo "show"; 
-                    } 
+                    if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01'
+                        || $industry_filter
+                        || $referral_filter
+                        || (isset($_GET['tags']) && is_array($_GET['tags']))
+                    )
+                    { echo "show"; } 
                     ?>
                 "
                 id="advancedFilter"
             >
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned date</label>
-                            <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date from</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date to</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
                             <label>Tag</label>
                             <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
@@ -622,7 +604,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             require_once "modals/client/client_bulk_edit_industry.php";
             require_once "modals/client/client_bulk_edit_referral.php";
             require_once "modals/client/client_bulk_edit_hourly_rate.php";
-            require_once "modals/client/client_bulk_assign_tags.php"; 
+            require_once "modals/client/client_bulk_assign_tags.php";
+            require_once "modals/client/client_bulk_add_ticket.php"; 
             require_once "modals/client/client_bulk_email.php";
         ?>
     </form>
@@ -634,7 +617,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/client/client_add.php";
 require_once "modals/client/client_import.php";
 require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";

agent/contact_details.php

@@ -263,7 +263,7 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addAssetModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/asset/asset_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-desktop mr-2"></i>New Asset
                         </a>
                         <div class="dropdown-divider"></div>
@@ -1175,7 +1175,6 @@ if (isset($_GET['contact_id'])) {
 
 require_once "modals/ticket/ticket_add.php";
 require_once "modals/recurring_ticket/recurring_ticket_add.php";
-require_once "modals/asset/asset_add.php";
 require_once "modals/credential/credential_add.php";
 require_once "modals/document/document_add.php";
 require_once "modals/file/file_upload.php";

agent/contacts.php

@@ -90,7 +90,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-address-book mr-2"></i>Contacts</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addContactModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/contact/contact_add.php?client_id=<?= $client_id ?>">
                     <i class="fas fa-plus mr-2"></i>New Contact
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -557,48 +557,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 </div>
 
-<!-- JavaScript to Show/Hide Password Form Group -->
-<script>
-
-    function generatePassword(type, id) {
-        // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
-        jQuery.get(
-            "ajax.php", {
-                get_readable_pass: 'true'
-            },
-            function(data) {
-                //If we get a response from post.php, parse it as JSON
-                const password = JSON.parse(data);
-
-                // Set the password value to the correct modal, based on the type
-                if (type == "add") {
-                    document.getElementById("password-add").value = password;
-                } else if (type == "edit") {
-                    document.getElementById("password-edit-"+id.toString()).value = password;
-                }
-            }
-        );
-    }
-
-    $(document).ready(function() {
-        $('.authMethod').on('change', function() {
-            var $form = $(this).closest('.authForm');
-            if ($(this).val() === 'local') {
-                $form.find('.passwordGroup').show();
-            } else {
-                $form.find('.passwordGroup').hide();
-            }
-        });
-        $('.authMethod').trigger('change');
-
-    });
-</script>
-
 <script src="../js/bulk_actions.js"></script>
 
 <?php
 
-require_once "modals/contact/contact_add.php";
 require_once "modals/contact/contact_export.php";
 if ($client_url) {
     require_once "modals/contact/contact_invite.php";

agent/dashboard.php

@@ -660,7 +660,7 @@ if ($user_config_dashboard_technical_enable == 1) {
             <a class="small-box bg-warning" href="domains.php?sort=domain_expire&order=ASC">
                 <div class="inner">
                     <h3><?php echo $expiring_domains; ?></h3>
-                    <p>Expiring Domains</p>
+                    <p>Expiring Domains <small>30 Day</small></p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-globe"></i>
@@ -673,7 +673,7 @@ if ($user_config_dashboard_technical_enable == 1) {
             <a class="small-box bg-primary" href="certificates.php?sort=certificate_expire&order=ASC">
                 <div class="inner">
                     <h3><?php echo $expiring_certificates; ?></h3>
-                    <p>Expiring Certificates</p>
+                    <p>Expiring Certificates<small>30 Day</small></p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-lock"></i>

agent/document_details.php

@@ -163,17 +163,19 @@ $page_title = $row['document_name'];
     <div class="col-md-3 d-print-none">
         <div class="row">
             <div class="col-12 mb-3">
-                <button type="button" class="btn btn-primary ajax-modal mr-2"
+                <button type="button" class="btn btn-primary ajax-modal mr-1"
                     data-modal-size="lg"
                     data-modal-url="modals/document/document_edit.php?id=<?= $document_id ?>">
-                    <i class="fas fa-fw fa-edit"></i>
+                    <i class="fas fa-fw fa-edit" title="Edit"></i>
                 </button>
-                <button type="button" class="btn btn-secondary mr-2" data-toggle="modal" data-target="#shareModal"
+                <button type="button" class="btn btn-secondary mr-1" data-toggle="modal" data-target="#shareModal"
                     onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
-                    <i class="fas fa-fw fa-share"></i>
+                    <i class="fas fa-fw fa-share" title="Share"></i>
                 </button>
-                <a class="btn btn-success mr-2" href="post.php?export_document=<?php echo $document_id; ?>"><i class='fas fa-fw fa-file-pdf'></i></a>
-                <button type="button" class="btn btn-secondary" onclick="window.print();"><i class="fas fa-fw fa-print"></i></button>
+                <a class="btn btn-success mr-1" href="post.php?export_document=<?php echo $document_id; ?>"><i class='fas fa-fw fa-file-pdf' title="PDF Export"></i></a>
+                <button type="button" class="btn btn-secondary mr-4" onclick="window.print();"><i class="fas fa-fw fa-print" title="Print"></i></button>
+                <a class="btn btn-warning mr-1 confirm-link" href="post.php?archive_document=<?= $document_id ?>" title="Archive"><i class='fas fa-fw fa-archive'></i></a>
+                <a class="btn btn-danger confirm-link" href="post.php?delete_document=<?= $document_id ?>&from=document_details" title="Delete"><i class='fas fa-fw fa-trash-alt'></i></a>
             </div>
         </div>
         <div class="card card-body bg-light">

agent/expenses.php

@@ -117,34 +117,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) || $_GET['canned_date'] !== "custom" || $account_filter || $vendor_filter || $category_filter) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01' || $account_filter || $vendor_filter || $category_filter) { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                         <div class="col-sm-2">

agent/global_search.php

@@ -85,6 +85,8 @@ if (isset($_GET['query'])) {
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
         WHERE ticket_archived_at IS NULL
             AND (ticket_subject LIKE '%$query%'
+            OR ticket_details LIKE '%$query%'
+            OR CONCAT(ticket_prefix,ticket_number) LIKE '%$query%'
             OR ticket_number = '$ticket_num_query')
             $access_permission_query
         ORDER BY ticket_id DESC LIMIT 5"

agent/includes/client_side_nav.php

@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php if (isset($_GET['client_id'])) { echo "gray"; } else { echo nullable_htmlentities($config_theme); } ?> d-print-none">
 
-    <a class="brand-link pb-1 mt-1" href="clients.php">
+    <a class="brand-link pb-1 mt-1" href="/agent/clients.php">
         <p class="h5">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
              <span class="brand-text">
@@ -19,14 +19,14 @@
             <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
 
                 <li class="nav-item mt-3">
-                    <a href="client_overview.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_overview.php") { echo "active"; } ?>">
+                    <a href="/agent/client_overview.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_overview.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-tachometer-alt"></i>
                         <p>Overview</p>
                     </a>
                 </li>
 
                 <li class="nav-item">
-                    <a href="contacts.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "contacts.php" || basename($_SERVER["PHP_SELF"]) == "contact_details.php") { echo "active"; } ?>">
+                    <a href="/agent/contacts.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "contacts.php" || basename($_SERVER["PHP_SELF"]) == "contact_details.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-address-book"></i>
                         <p>
                             Contacts
@@ -39,7 +39,7 @@
                 </li>
 
                 <li class="nav-item">
-                    <a href="locations.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "locations.php") { echo "active"; } ?>">
+                    <a href="/agent/locations.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "locations.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-map-marker-alt"></i>
                         <p>
                             Locations
@@ -55,7 +55,7 @@
                     <li class="nav-header mt-3">SUPPORT</li>
 
                     <li class="nav-item">
-                        <a href="tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
+                        <a href="/agent/tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
                                 Tickets
@@ -69,7 +69,7 @@
                     </li>
 
                     <li class="nav-item">
-                        <a href="recurring_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
+                        <a href="/agent/recurring_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Tickets
@@ -83,7 +83,7 @@
                     </li>
 
                     <li class="nav-item">
-                        <a href="projects.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
+                        <a href="/agent/projects.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>
                                 Projects
@@ -97,7 +97,7 @@
                 <?php } ?>
 
                 <li class="nav-item">
-                    <a href="vendors.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
+                    <a href="/agent/vendors.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-building"></i>
                         <p>
                             Vendors
@@ -110,7 +110,7 @@
                 </li>
 
                 <li class="nav-item">
-                    <a href="calendar.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
+                    <a href="/agent/calendar.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-calendar-alt"></i>
                         <p>
                             Calendar
@@ -128,7 +128,7 @@
 
                     <?php if (lookupUserPermission("module_support") >= 1) { ?>
                         <li class="nav-item">
-                            <a href="assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php" || basename($_SERVER["PHP_SELF"]) == "client_asset_details.php") { echo "active"; } ?>">
+                            <a href="/agent/assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php" || basename($_SERVER["PHP_SELF"]) == "client_asset_details.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-desktop"></i>
                                 <p>
                                     Assets
@@ -141,7 +141,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="software.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
+                            <a href="/agent/software.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-cube"></i>
                                 <p>
                                     Licenses
@@ -155,7 +155,7 @@
 
                         <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                             <li class="nav-item">
-                                <a href="credentials.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
+                                <a href="/agent/credentials.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
                                     <i class="nav-icon fas fa-key"></i>
                                     <p>
                                         Credentials
@@ -169,7 +169,7 @@
                         <?php } ?>
 
                         <li class="nav-item">
-                            <a href="networks.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "networks.php") { echo "active"; } ?>">
+                            <a href="/agent/networks.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "networks.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-network-wired"></i>
                                 <p>
                                     Networks
@@ -182,7 +182,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="racks.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "racks.php") { echo "active"; } ?>">
+                            <a href="/agent/racks.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "racks.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-server"></i>
                                 <p>
                                     Racks
@@ -195,7 +195,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="certificates.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "certificates.php") { echo "active"; } ?>">
+                            <a href="/agent/certificates.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "certificates.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-lock"></i>
                                 <p>
                                     Certificates
@@ -209,7 +209,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="domains.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
+                            <a href="/agent/domains.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-globe"></i>
                                 <p>
                                     Domains
@@ -223,7 +223,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="services.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "services.php") { echo "active"; } ?>">
+                            <a href="/agent/services.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "services.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-stream"></i>
                                 <p>
                                     Services
@@ -236,7 +236,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="documents.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "documents.php" || basename($_SERVER["PHP_SELF"]) == "document_details.php") { echo "active"; } ?>">
+                            <a href="/agent/documents.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "documents.php" || basename($_SERVER["PHP_SELF"]) == "document_details.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-folder"></i>
                                 <p>
                                     Documents
@@ -252,7 +252,7 @@
 
                     <!-- Allow files even without module_support for things like contracts, etc. ) -->
                     <li class="nav-item">
-                        <a href="files.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "files.php") { echo "active"; } ?>">
+                        <a href="/agent/files.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "files.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-paperclip"></i>
                             <p>
                                 Files
@@ -273,7 +273,7 @@
                     <?php if (lookupUserPermission("module_sales") >= 1) { ?>
 
                         <li class="nav-item">
-                            <a href="invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
+                            <a href="/agent/invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-file-invoice"></i>
                                 <p>
                                     Invoices
@@ -286,7 +286,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
+                            <a href="/agent/recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-redo-alt"></i>
                                 <p>
                                     Recurring Invoices
@@ -299,7 +299,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
+                            <a href="/agent/quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-comment-dollar"></i>
                                 <p>
                                     Quotes
@@ -315,7 +315,7 @@
 
                     <?php if (lookupUserPermission("module_financial") >= 1) { ?>
                         <li class="nav-item">
-                            <a href="payments.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
+                            <a href="/agent/payments.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-credit-card"></i>
                                 <p>
                                     Payments
@@ -329,7 +329,7 @@
                     <?php } ?>
 
                     <li class="nav-item">
-                        <a href="trips.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
+                        <a href="/agent/trips.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-route"></i>
                             <p>
                                 Trips

agent/includes/inc_all.php

@@ -1,19 +1,19 @@
 <?php
 // Configuration & core
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
 
 // Page setup
-require_once "../includes/page_title.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
 
 // Layout UI
-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 $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once 'includes/get_side_nav_counts.php';
+require_once 'includes/side_nav.php';
 
 // Wrapper & alerts
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';

agent/includes/inc_all_client.php

@@ -1,9 +1,9 @@
 <?php
 
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
 
 // Perms
 enforceUserPermission('module_client');
@@ -35,7 +35,7 @@ if (isset($_GET['client_id'])) {
     );
 
     if (mysqli_num_rows($sql) == 0) {
-        require_once "../includes/header.php";
+        require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
 
         echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1></center>";
     } else {
@@ -304,10 +304,10 @@ if (isset($_GET['client_id'])) {
     }
 }
 
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/client_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";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once 'includes/client_side_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once 'includes/inc_client_top_head.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';

agent/includes/inc_client_overview_all.php

@@ -1,12 +1,12 @@
 <?php
 
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/client_overview_side_nav.php";
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once 'includes/client_overview_side_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';

agent/includes/side_nav.php

@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
-    <a class="brand-link" href="dashboard.php">
+    <a class="brand-link" href="/agent/dashboard.php">
         <div class="brand-image"></div>
         <span class="brand-text h4"><?php echo nullable_htmlentities($session_company_name); ?></span>
     </a>
@@ -13,14 +13,14 @@
         <nav>
             <ul class="nav nav-pills nav-sidebar flex-column mt-3" data-widget="treeview" data-accordion="false">
                 <li class="nav-item">
-                    <a href="dashboard.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "dashboard.php") { echo "active"; } ?>">
+                    <a href="/agent/dashboard.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "dashboard.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-tachometer-alt"></i>
                         <p>Dashboard</p>
                     </a>
                 </li>
                 <?php if (lookupUserPermission("module_client") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="clients.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients.php") { echo "active"; } ?>">
+                        <a href="/agent/clients.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-users"></i>
                             <p>
                               Clients
@@ -36,7 +36,7 @@
                     <?php if ($config_module_enable_ticketing == 1) { ?>
                         <li class="nav-header mt-3">SUPPORT</li>
                         <li class="nav-item">
-                            <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
+                            <a href="/agent/tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-life-ring"></i>
                                 <p>
                                     Tickets
@@ -47,7 +47,7 @@
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="recurring_tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
+                            <a href="/agent/recurring_tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-redo-alt"></i>
                                 <p>
                                     Recurring Tickets
@@ -58,7 +58,7 @@
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="projects.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
+                            <a href="/agent/projects.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-project-diagram"></i>
                                 <p>
                                     Projects
@@ -72,7 +72,7 @@
                 <?php } ?>
 
                 <li class="nav-item">
-                    <a href="calendar.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
+                    <a href="/agent/calendar.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-calendar-alt"></i>
                         <p>Calendar</p>
                     </a>
@@ -80,7 +80,7 @@
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_sales") >= 1) { ?>
                     <li class="nav-header mt-3">BILLING</li>
                     <li class="nav-item">
-                        <a href="quotes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
+                        <a href="/agent/quotes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-comment-dollar"></i>
                             <p>
                                 Quotes
@@ -91,7 +91,7 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
+                        <a href="/agent/invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
@@ -102,7 +102,7 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="recurring_invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
+                        <a href="/agent/recurring_invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Invoices
@@ -113,13 +113,13 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") { echo "active"; } ?>">
+                        <a href="/agent/revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Revenues</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="products.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
+                        <a href="/agent/products.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-box-open"></i>
                             <p>Products</p>
                         </a>
@@ -128,25 +128,25 @@
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-header mt-3">FINANCE</li>
                     <li class="nav-item">
-                        <a href="payments.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
+                        <a href="/agent/payments.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-credit-card"></i>
                             <p>Payments</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="vendors.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
+                        <a href="/agent/vendors.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendors</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php") { echo "active"; } ?>">
+                        <a href="/agent/expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-shopping-cart"></i>
                             <p>Expenses</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="recurring_expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") { echo "active"; } ?>">
+                        <a href="/agent/recurring_expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Expenses
@@ -157,19 +157,19 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
+                        <a href="/agent/accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-piggy-bank"></i>
                             <p>Accounts</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="transfers.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "transfers.php") { echo "active"; } ?>">
+                        <a href="/agent/transfers.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "transfers.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-exchange-alt"></i>
                             <p>Transfers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="trips.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
+                        <a href="/agent/trips.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-route"></i>
                             <p>Trips</p>
                         </a>
@@ -178,7 +178,7 @@
 
                 <?php if (lookupUserPermission("module_client") >= 1) { ?>
                 <li class="nav-item mt-3">
-                    <a href="contacts.php" class="nav-link">
+                    <a href="/agent/contacts.php" class="nav-link">
                         <i class="fas fa-users nav-icon"></i>
                         <p>Client Overview</p>
                         <i class="fas fa-angle-right nav-icon float-right"></i>
@@ -188,7 +188,7 @@
 
                 <?php if (lookupUserPermission("module_reporting") >= 1) { ?>
                     <li class="nav-item mt-3">
-                        <a href="reports/" class="nav-link">
+                        <a href="/agent/reports/" class="nav-link">
                             <i class="fas fa-chart-line nav-icon"></i>
                             <p>Reports</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>

agent/invoice.php

@@ -163,7 +163,9 @@ if (isset($_GET['invoice_id'])) {
     //Product autocomplete
     $products_sql = mysqli_query($mysqli, "
         SELECT 
-            product_name AS label,
+            CONCAT(product_code, ' - ', product_name) AS label,
+            product_name,
+            product_code,
             product_type AS type,
             product_description AS description,
             product_price AS price,
@@ -247,12 +249,12 @@ if (isset($_GET['invoice_id'])) {
                             <?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
 
                                 <div class="btn-group">
-                                    <button type="button" class="btn btn-success ajax-modal" data-modal-url="modals/invoice/invoice_pay.php?id=<?= $invoice_id ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment</button>
+                                    <button type="button" class="btn btn-success ajax-modal" data-modal-url="modals/payment/payment_add.php?id=<?= $invoice_id ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment</button>
 
                                     <?php if (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
                                     <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/invoice/invoice_saved_method_pay.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>                                    
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/payment/payment_saved_method_add.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>                                    
                                     </div>
                                     <?php } ?>
 
@@ -747,12 +749,20 @@ require_once "../includes/footer.php";
 <script>
 
 $(function() {
+
     var availableProducts = <?php echo $json_products ?? '[]'?>;
 
     $("#name").autocomplete({
-        source: availableProducts,
         minLength: 1,
         delay: 0,
+        source: function(request, response) {
+            var term = $.ui.autocomplete.escapeRegex(request.term.toLowerCase());
+            var matcher = new RegExp(term, "i");
+            var matches = $.grep(availableProducts, function(item) {
+                return matcher.test(item.label) || matcher.test(item.product_name) || matcher.test(item.product_code);
+            });
+            response(matches);
+        },
         select: function (event, ui) {
             $("#name").val(ui.item.label);
             $("#desc").val(ui.item.description);

agent/invoices.php

@@ -97,6 +97,7 @@ $sql = mysqli_query(
     "SELECT SQL_CALC_FOUND_ROWS * FROM invoices
     LEFT JOIN clients ON invoice_client_id = client_id
     LEFT JOIN categories ON invoice_category_id = category_id
+    LEFT JOIN recurring_invoices ON invoice_recurring_invoice_id = recurring_invoice_id
     WHERE ($status_query)
     $overdue_query
     $category_query
@@ -230,34 +231,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+            <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned Date</label>
-                            <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date From</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo $dtf; ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date To</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo $dtt; ?>">
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
                 </div>
@@ -317,6 +299,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Status <?php if ($sort == 'invoice_status') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            <th>Recurring</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -349,6 +332,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         if ($client_net_terms == 0) {
                             $client_net_terms = $config_default_net_terms;
                         }
+                        $recurring_invoice_id = intval($row['recurring_invoice_id']);
+                        $recurring_invoice_prefix = nullable_htmlentities($row['recurring_invoice_prefix']);
+                        $recurring_invoice_number = nullable_htmlentities($row['recurring_invoice_number']);
+                        if($recurring_invoice_id) {
+                            $recurring_invoice_display = "<i class='fas fa-fw fa-redo-alt text-secondary mr-1'></i><a href='recurring_invoice.php?recurring_invoice_id=$recurring_invoice_id'>$recurring_invoice_prefix$recurring_invoice_number</a>";
+                        } else {
+                            $recurring_invoice_display = "-";
+                        }
+
+                        
 
                         $now = time();
 
@@ -386,6 +379,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                   <?php echo $invoice_status; ?>
                               </span>
                             </td>
+                            <td><?= $recurring_invoice_display ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@@ -394,7 +388,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div class="dropdown-menu">
                                         <?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
                                             <a class="dropdown-item ajax-modal" href="#"
-                                                data-modal-url="modals/invoice/invoice_pay.php?id=<?= $invoice_id ?>">
+                                                data-modal-url="modals/payment/payment_add.php?id=<?= $invoice_id ?>">
                                                 <i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
                                             </a>
                                             <div class="dropdown-divider"></div>
@@ -454,6 +448,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "modals/invoice/invoice_add.php";
-if ($client_url) { require_once "modals/invoice/invoice_payment_add_bulk.php"; }
+if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
 require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";

agent/js/ticket_time_tracking.js

@@ -23,6 +23,15 @@
         }
 
         function displayTime() {
+
+            // Show hrs, mins, sec input placeholders if auto-start is off
+            if (elapsedSecs === 0) {
+                document.getElementById("hours").value = "";
+                document.getElementById("minutes").value = "";
+                document.getElementById("seconds").value = "";
+                return;
+            }
+
             let totalSeconds = elapsedSecs;
             let hours = Math.floor(totalSeconds / 3600);
             totalSeconds %= 3600;

agent/modals/asset/asset_add.php

@@ -1,455 +1,496 @@
-<div class="modal" id="addAssetModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags($_GET['type'])); }else{ echo "Asset"; } ?></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+require_once '../../../includes/modal_header.php';
 
-                <div class="modal-body ui-front">
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$type = nullable_htmlentities($_GET['type'] ?? '');
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-asset-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-asset-network">Network</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-asset-assignment">Assignment</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-asset-purchase">Purchase</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-asset-login">Login</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-asset-notes">Notes</a>
-                        </li>
-                    </ul>
+if ($client_id) {
+    $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+    $sql_vendor_select = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+    $sql_location_select = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+    $sql_contact_select = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+} else {
+    $sql_client_select = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+}   
 
-                    <hr>
+// OS typeahead suggestions
+$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL");
+if ($os_sql && mysqli_num_rows($os_sql) > 0) {
+    $os_arr = [];
+    while ($row = mysqli_fetch_assoc($os_sql)) {
+        // jQuery UI Autocomplete expects {label: "...", value: "..."}
+        $label = $row['label'];
+        $os_arr[] = ['label' => $label, 'value' => $label];
+    }
+    $json_os = json_encode($os_arr);
+}
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-asset-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>New <?php if ($type) { echo ucwords($type); } else { echo "Asset"; } ?></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
 
-                                <div class="form-group">
-                                    <label>Client <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+    <div class="modal-body ui-front">
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-asset-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-network">Network</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-assignment">Assignment</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-purchase">Purchase</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-login">Login</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-notes">Notes</a>
+            </li>
+        </ul>
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+        <hr>
 
-                            <?php } ?>
+        <div class="tab-content">
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Asset name or asset tag" maxlength="200" required autofocus>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-asset-details">
+
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php } else { ?>
+
+                    <div class="form-group">
+                        <label>Client <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Type <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="type" required>
-                                        <option value="">- Select Type -</option>
-                                        <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
-                                            <option><?php echo $asset_type; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <?php //Do not display Make Model or Serial if Virtual is selected
-                            if ($_GET['type'] !== 'virtual') { ?>
-                                <div class="form-group">
-                                    <label>Make</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Model</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Serial Number</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="serial" placeholder="Serial number" maxlength="200">
-                                    </div>
-                                </div>
-                            <?php } ?>
-
-                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                <div class="form-group">
-                                    <label>Operating System</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="os" id="os" placeholder="ex Windows 10 Pro" maxlength="200">
-                                    </div>
-                                </div>
-                            <?php } ?>
+                                while ($row = mysqli_fetch_array($sql_client_select)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?= $client_id_select ?>"><?= $client_name ?></option>
 
+                                <?php } ?>
+                            </select>
                         </div>
+                    </div>
 
-                        <div class="tab-pane fade" id="pills-asset-network">
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Network</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="network">
-                                        <option value="">- Select Network -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $network_id = intval($row['network_id']);
-                                            $network_name = nullable_htmlentities($row['network_name']);
-                                            $network = nullable_htmlentities($row['network']);
-
-                                            ?>
-                                            <option value="<?php echo $network_id; ?>"><?php echo $network_name; ?> - <?php echo $network; ?></option>
-
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>IP Address or DHCP</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="dhcp" value="1">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>NAT IP Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>IPv6 Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="ipv6" placeholder="ex. 2001:0db8:0000:0000:0000:ff00:0042:8329" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>MAC Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri" placeholder="URI http:// ftp:// ssh: etc" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI 2</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri_2" placeholder="URI http:// ftp:// ssh: etc" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Client URI</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri_client" placeholder="URI http:// ftp:// ssh: etc -- viewable in Client Portal" maxlength="500">
-                                </div>
-                            </div>
+                <?php } ?>
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-asset-assignment">
-
-                            <div class="form-group">
-                                <label>Physical Location</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
-                                </div>
-                            </div>
-
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Location</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="location">
-                                        <option value="">- Select Location -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $location_id = intval($row['location_id']);
-                                            $location_name = nullable_htmlentities($row['location_name']);
-                                            ?>
-                                            <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Assign To</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="contact">
-                                        <option value="">- Select Contact -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $contact_id = intval($row['contact_id']);
-                                            $contact_name = nullable_htmlentities($row['contact_name']);
-                                            ?>
-                                            <option 
-                                                <?php if (isset($_GET['contact_id']) && $contact_id == intval($_GET['contact_id'])) { 
-                                                echo "selected"; }
-                                                ?>
-                                                value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
-                                            </option>
-
-                                        <?php } ?>
-
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Status</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="status">
-                                        <option value="">- Select Status -</option>
-                                        <?php foreach($asset_status_array as $asset_status) { ?>
-                                            <option><?php echo $asset_status; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-asset-purchase">
-
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Vendor</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="vendor">
-                                        <option value="">- Select Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $vendor_id = intval($row['vendor_id']);
-                                            $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                            ?>
-                                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-
-                            <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <div class="form-group">
-                                    <label>Purchase Reference</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Purchase Date</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                        </div>
-                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
-                                    </div>
-                                </div>
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Install Date</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="install_date" max="2999-12-31">
-                                </div>
-                            </div>
-
-                            <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <div class="form-group">
-                                    <label>Warranty Expire</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
-                                        </div>
-                                        <input type="date" class="form-control" name="warranty_expire" max="2999-12-31">
-                                    </div>
-                                </div>
-                            <?php } ?>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-asset-login">
-
-                            <div class="form-group">
-                                <label>Username</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="username" placeholder="Username">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Password</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="password" placeholder="Password" autocomplete="off">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-asset-notes">
-
-                            <div class="form-group">
-                                <label>Upload Photo</label>
-                                <input type="file" class="form-control-file" name="file" accept="image/*">
-                            </div>
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-
-                        </div>
-
+                        <input type="text" class="form-control" name="name" placeholder="Asset name or asset tag" maxlength="200" required autofocus>
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Type <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
+                                <option><?= $asset_type ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <?php //Do not display Make Model or Serial if Virtual is selected
+                if ($type !== 'virtual') { ?>
+                    <div class="form-group">
+                        <label>Make</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Model</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Serial Number</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="serial" placeholder="Serial number" maxlength="200">
+                        </div>
+                    </div>
+                <?php } ?>
+
+                <?php if ($type !== 'network' && $type !== 'other') { ?>
+                    <div class="form-group">
+                        <label>Operating System</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="os" id="os" placeholder="ex Windows 10 Pro" maxlength="200">
+                        </div>
+                    </div>
+                <?php } ?>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-network">
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Network</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                        </div>
+                        <select class="form-control select2" name="network">
+                            <option value="">- Select Network -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_network_select)) {
+                                $network_id = intval($row['network_id']);
+                                $network_name = nullable_htmlentities($row['network_name']);
+                                $network = nullable_htmlentities($row['network']);
+
+                                ?>
+                                <option value="<?= $network_id ?>"><?= $network_name ?> - <?= $network ?></option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>IP Address or DHCP</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="dhcp" value="1">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>NAT IP Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>IPv6 Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="ipv6" placeholder="ex. 2001:0db8:0000:0000:0000:ff00:0042:8329" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>MAC Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri" placeholder="URI http:// ftp:// ssh: etc" maxlength="500">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI 2</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri_2" placeholder="URI http:// ftp:// ssh: etc" maxlength="500">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Client URI</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri_client" placeholder="URI http:// ftp:// ssh: etc -- viewable in Client Portal" maxlength="500">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-assignment">
+
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
+                    </div>
+                </div>
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_location_select)) {
+                                $location_id = intval($row['location_id']);
+                                $location_name = nullable_htmlentities($row['location_name']);
+                                ?>
+                                <option value="<?= $location_id ?>"><?= $location_name ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Assign To</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_contact_select)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name = nullable_htmlentities($row['contact_name']);
+                                ?>
+                                <option 
+                                    <?php if ($contact_id == $contact_id_select) { 
+                                    echo "selected"; }
+                                    ?>
+                                    value="<?= $contact_id_select ?>"><?= $contact_name ?>
+                                </option>
+
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Status</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                        </div>
+                        <select class="form-control select2" name="status">
+                            <option value="">- Select Status -</option>
+                            <?php foreach($asset_status_array as $asset_status) { ?>
+                                <option><?php echo $asset_status; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-purchase">
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Vendor</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                        </div>
+                        <select class="form-control select2" name="vendor">
+                            <option value="">- Select Vendor -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_vendor_select)) {
+                                $vendor_id = intval($row['vendor_id']);
+                                $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                ?>
+                                <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <?php if ($type !== 'virtual') { ?>
+                    <div class="form-group">
+                        <label>Purchase Reference</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Purchase Date</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
+                        </div>
+                    </div>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Install Date</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="install_date" max="2999-12-31">
+                    </div>
+                </div>
+
+                <?php if ($type !== 'virtual') { ?>
+                    <div class="form-group">
+                        <label>Warranty Expire</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="warranty_expire" max="2999-12-31">
+                        </div>
+                    </div>
+                <?php } ?>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-login">
+
+                <div class="form-group">
+                    <label>Username</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="username" placeholder="Username">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Password</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="password" placeholder="Password" autocomplete="off">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-notes">
+
+                <div class="form-group">
+                    <label>Upload Photo</label>
+                    <input type="file" class="form-control-file" name="file" accept="image/*">
+                </div>
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+
+            </div>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<!-- JSON Autocomplete / type ahead -->
+<link rel="stylesheet" href="/plugins/jquery-ui/jquery-ui.min.css">
+<script src="/plugins/jquery-ui/jquery-ui.min.js"></script>
+<script>
+    $(function() {
+        var operatingSystems = <?php echo $json_os; ?>;
+        $("#os").autocomplete({
+            source: operatingSystems,  // Should be an array of objects with 'label' and 'value'
+            select: function(event, ui) {
+                $("#os").val(ui.item.label); // Set the input field value to the selected label
+                return false;
+            }
+        });
+    });
+</script>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_add_ticket.php

@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="form-group">
-                    <textarea class="form-control tinymceTicket<?php if($config_ai_enable) { echo "AI"; } ?>" id="textInput" name="bulk_details"></textarea>
+                    <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
                 </div>
 
                 <div class="row">
@@ -52,7 +52,7 @@
                                 <select class="form-control select2" name="bulk_category">
                                     <option value="0">- Not Categorized -</option>
                                     <?php
-                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL");
+                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql_categories)) {
                                         $category_id = intval($row['category_id']);
                                         $category_name = nullable_htmlentities($row['category_name']);
@@ -81,7 +81,7 @@
                             $sql = mysqli_query(
                                 $mysqli,
                                 "SELECT user_id, user_name FROM users
-                                WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
                             );
                             while ($row = mysqli_fetch_array($sql)) {
                                 $user_id = intval($row['user_id']);

agent/modals/asset/asset_edit.php

@@ -53,37 +53,38 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
+
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class='fa fa-fw fa-<?php echo $device_icon; ?> mr-2'></i>Editing asset: <strong><?php echo $asset_name; ?></strong></h5>
+    <h5 class="modal-title"><i class='fa fa-fw fa-<?= $device_icon ?> mr-2'></i>Editing asset: <strong><?= $asset_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="asset_id" value="<?= $asset_id ?>">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
 
     <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
-                <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $asset_id; ?>">Details</a>
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-network<?php echo $asset_id; ?>">Network</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-network">Network</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-assignment<?php echo $asset_id; ?>">Assignment</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-assignment">Assignment</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-purchase<?php echo $asset_id; ?>">Purchase</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-purchase">Purchase</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $asset_id; ?>">Notes</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-history<?php echo $asset_id; ?>">History</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-history">History</a>
             </li>
         </ul>
 
@@ -91,7 +92,7 @@ ob_start();
 
         <div class="tab-content" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
-            <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
+            <div class="tab-pane fade show active" id="pills-details">
 
                 <div class="form-group">
                     <label>Name <strong class="text-danger">*</strong></label>
@@ -99,7 +100,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="name" placeholder="Name the asset" maxlength="200" value="<?php echo $asset_name; ?>" required>
+                        <input type="text" class="form-control" name="name" placeholder="Name the asset" maxlength="200" value="<?= $asset_name ?>" required>
                     </div>
                 </div>
 
@@ -109,7 +110,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255" value="<?php echo $asset_description; ?>">
+                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255" value="<?= $asset_description ?>">
                     </div>
                 </div>
 
@@ -135,7 +136,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200" value="<?php echo $asset_make; ?>">
+                            <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200" value="<?= $asset_make ?>">
                         </div>
                     </div>
 
@@ -145,7 +146,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200" value="<?php echo $asset_model; ?>">
+                            <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200" value="<?= $asset_model ?>">
                         </div>
                     </div>
 
@@ -155,7 +156,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="serial" placeholder="Serial number" maxlength="200" value="<?php echo $asset_serial; ?>">
+                            <input type="text" class="form-control" name="serial" placeholder="Serial number" maxlength="200" value="<?= $asset_serial ?>">
                         </div>
                     </div>
                 <?php } ?>
@@ -167,14 +168,14 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" maxlength="200" value="<?php echo $asset_os; ?>">
+                            <input type="text" class="form-control" name="os" id="os" placeholder="ex Windows 10 Pro" maxlength="200" value="<?= $asset_os ?>">
                         </div>
                     </div>
                 <?php } ?>
 
             </div>
 
-            <div class="tab-pane fade" id="pills-network<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-network">
 
                 <div class="form-group">
                     <label>Network</label>
@@ -227,7 +228,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" value="<?php echo $asset_nat_ip; ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="nat_ip" value="<?= $asset_nat_ip ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -237,7 +238,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ipv6" value="<?php echo $asset_ipv6; ?>" placeholder="ex. 2001:0db8:0000:0000:0000:ff00:0042:8329" maxlength="200">
+                        <input type="text" class="form-control" name="ipv6" value="<?= $asset_ipv6 ?>" placeholder="ex. 2001:0db8:0000:0000:0000:ff00:0042:8329" maxlength="200">
                     </div>
                 </div>
 
@@ -247,7 +248,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" value="<?php echo $asset_mac; ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="mac" value="<?= $asset_mac ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -257,7 +258,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="uri" placeholder="URI http:// ftp:// ssh: etc" maxlength="500" value="<?php echo $asset_uri; ?>">
+                        <input type="text" class="form-control" name="uri" placeholder="URI http:// ftp:// ssh: etc" maxlength="500" value="<?= $asset_uri ?>">
                     </div>
                 </div>
 
@@ -282,7 +283,7 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-assignment<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-assignment">
 
                 <div class="form-group">
                     <label>Physical Location</label>
@@ -290,7 +291,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?php echo $asset_physical_location; ?>">
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?= $asset_physical_location ?>">
                     </div>
                 </div>
 
@@ -315,7 +316,7 @@ ob_start();
                                     $location_name_select_display = $location_name_select;
                                 }
                                 ?>
-                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select_display; ?></option>
+                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?= $location_id_select ?>"><?= $location_name_select_display ?></option>
 
                             <?php } ?>
                         </select>
@@ -343,8 +344,8 @@ ob_start();
                                     $contact_name_select_display = $contact_name_select;
                                 }
                                 ?>
-                                <option <?php if ($asset_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>">
-                                    <?php echo $contact_name_select_display; ?>
+                                <option <?php if ($asset_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?= $contact_id_select ?>">
+                                    <?= $contact_name_select_display ?>
                                 </option>
 
                             <?php } ?>
@@ -360,7 +361,7 @@ ob_start();
                         </div>
                         <select class="form-control select2" name="status">
                             <?php foreach($asset_status_array as $asset_status_select) { ?>
-                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
+                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?= $asset_status_select ?></option>
                             <?php } ?>
                         </select>
                     </div>
@@ -368,7 +369,7 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-purchase<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-purchase">
 
                 <div class="form-group">
                     <label>Vendor</label>
@@ -391,7 +392,7 @@ ob_start();
                                     $vendor_name_select_display = $vendor_name_select;
                                 }
                                 ?>
-                                <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select_display; ?></option>
+                                <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?= $vendor_id_select ?>"><?= $vendor_name_select_display ?></option>
 
                             <?php } ?>
                         </select>
@@ -405,7 +406,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number" value="<?php echo $asset_purchase_reference; ?>">
+                            <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number" value="<?= $asset_purchase_reference ?>">
                         </div>
                     </div>
 
@@ -415,7 +416,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                             </div>
-                            <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
+                            <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?= $asset_purchase_date ?>">
                         </div>
                     </div>
                 <?php } ?>
@@ -426,7 +427,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                         </div>
-                        <input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
+                        <input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?= $asset_install_date ?>">
                     </div>
                 </div>
 
@@ -437,18 +438,18 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                             </div>
-                            <input type="date" class="form-control" name="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
+                            <input type="date" class="form-control" name="warranty_expire" max="2999-12-31" value="<?= $asset_warranty_expire ?>">
                         </div>
                     </div>
                 <?php } ?>
 
             </div>
 
-            <div class="tab-pane fade" id="pills-notes<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-notes">
 
                 <div class="mb-3 text-center">
                     <?php if ($asset_photo) { ?>
-                        <img class="img-fluid" alt="asset_photo" src="<?php echo "../uploads/clients/$client_id/$asset_photo"; ?>">
+                        <img class="img-fluid" alt="asset_photo" src="<?= "../uploads/clients/$client_id/$asset_photo" ?>">
                     <?php } ?>
                 </div>
 
@@ -458,7 +459,7 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?= $asset_notes ?></textarea>
                 </div>
 
                 <p class="text-muted text-right">Asset ID: <?= $asset_id ?></p>
@@ -466,7 +467,7 @@ ob_start();
             </div>
 
 
-            <div class="tab-pane fade" id="pills-history<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-history">
 
                 <div class="form-group">
                     <label>Asset History</label>

agent/modals/asset/asset_import.php

@@ -14,7 +14,7 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
                 <div class="modal-body">
-                    <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location</p>
+                    <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
                     <hr>
                     <div class="form-group my-4">
                         <input type="file" class="form-control-file" name="file" accept=".csv" required>

agent/modals/client/client_add.php

@@ -1,378 +1,389 @@
-<div class="modal" id="addClientModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content border-dark">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            
-            <ul class="modal-header nav nav-pills nav-justified">
-                <li class="nav-item">
-                    <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
-                </li>
-                <?php if ($config_module_enable_accounting) { ?>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="pill" href="#pills-billing">Billing</a>
-                    </li>
-                <?php } ?>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                </li>
-            </ul>
-           
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="tab-content">
+require_once '../../../includes/modal_header.php';
 
-                        <div class="tab-pane fade show active" id="pills-details">
+// Filters
+$leads_filter = intval($_GET['lead'] ?? 0);
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name or Company" maxlength="200" required autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="lead" value="1" <?php if($leads_filter == 1){ echo "checked"; } ?>>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+// Selects
+$referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
 
-                            <div class="form-group">
-                                <label>Shortened Name</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" maxlength="6" oninput="this.value = this.value.toUpperCase()">
-                                </div>
-                            </div>
+$sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
 
-                            <div class="form-group">
-                                <label>Industry</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="type" placeholder="Company Type" maxlength="200">
-                                </div>
-                            </div>
+ob_start();
 
-                            <div class="form-group">
-                                <label>Referral</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <select class="form-control select2" data-tags="true" name="referral">
-                                        <option value="">- Select Referral -</option>
-                                        <?php
+?>
 
-                                        $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                        while ($row = mysqli_fetch_array($referral_sql)) {
-                                            $referral = nullable_htmlentities($row['category_name']); ?>
-                                            <option><?php echo $referral; ?></option>
-                                        <?php } ?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/category/category_add.php?category=Referral">
-                                            <i class="fas fa-fw fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
+<ul class="modal-header nav nav-pills nav-justified">
+    <li class="nav-item">
+        <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
+    </li>
+    <?php if ($config_module_enable_accounting) { ?>
+        <li class="nav-item">
+            <a class="nav-link" data-toggle="pill" href="#pills-billing">Billing</a>
+        </li>
+    <?php } ?>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+    </li>
+</ul>
 
-                            <div class="form-group">
-                                <label>Website</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="website" placeholder="ex. google.com" maxlength="200">
-                                </div>
-                            </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <div class="modal-body">
 
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="- Select Tags -"multiple>
-                                        <?php
+        <div class="tab-content">
 
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                            $tag_id_select = intval($row['tag_id']);
-                                            $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                            ?>
-                                            <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/tag/tag_add.php?type=1">
-                                            <i class="fas fa-fw fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-location">
-
-                            <div class="form-group">
-                                <label>Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="address" placeholder="Street Address" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>City</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="city" placeholder="City" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>State / Province</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="state" placeholder="State or Province" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Postal Code</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Country</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="country">
-                                        <option value="">- Select Country -</option>
-                                        <?php foreach($countries_array as $country_name) { ?>
-                                            <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            
-                            <label>Location Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="location_phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="location_phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="location_extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <label>Location Fax</label>    
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="location_fax_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="location_fax" placeholder="Fax Number">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-contact">
-
-                            <div class="form-group">
-                                <label>Primary Contact <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" id="primaryContact" name="contact" placeholder="Primary Contact Person" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Title</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200">
-                                </div>
-                            </div>
-
-                            <label>Contact Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="contact_phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="contact_phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="contact_extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <label>Mobile</label>    
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="contact_mobile_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="contact_mobile" placeholder="Mobile Phone Number">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Contact Email</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="contact_email" placeholder="Contact's Email Address" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <?php if ($config_module_enable_accounting) { ?>
-
-                            <div class="tab-pane fade" id="pills-billing">
-
-                                <div class="form-group">
-                                    <label>Hourly Rate</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Currency <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="currency_code" required>
-                                            <option value="">- Select Currency -</option>
-                                            <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                                                <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Payment Terms</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="net_terms">
-                                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-                                                <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Tax ID</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="tax_id_number" placeholder="Tax ID Number" maxlength="255">
-                                    </div>
-                                </div>
-
-                            </div>
-
-                        <?php } ?>
-
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="10" name="notes" placeholder="Enter some notes"></textarea>
+                        <input type="text" class="form-control" name="name" id="client_name" placeholder="Name or Company" maxlength="200" onfocusout="client_duplicate_check()" required autofocus>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="lead" value="1" <?php if($leads_filter == 1){ echo "checked"; } ?>>
                             </div>
                         </div>
-
+                    </div>
+                    <div class="mt-2">
+                        <span class="text-info" id="client_duplicate_info"></span>
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
+
+                <div class="form-group">
+                    <label>Shortened Name</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" maxlength="6" oninput="this.value = this.value.toUpperCase()">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Industry</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="type" placeholder="Company Type" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Referral</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <select class="form-control select2" data-tags="true" name="referral">
+                            <option value="">- Select Referral -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($referral_sql)) {
+                                $referral = nullable_htmlentities($row['category_name']); ?>
+                                <option><?php echo $referral; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/category/category_add.php?category=Referral">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Website</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="website" placeholder="ex. google.com" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="- Select Tags -"multiple>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id_select = intval($row['tag_id']);
+                                $tag_name_select = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=1">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-location">
+
+                <div class="form-group">
+                    <label>Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="address" placeholder="Street Address" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>City</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="city" placeholder="City" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>State / Province</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="state" placeholder="State or Province" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Postal Code</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Country</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
+                        </div>
+                        <select class="form-control select2" name="country">
+                            <option value="">- Select Country -</option>
+                            <?php foreach($countries_array as $country_name) { ?>
+                                <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                
+                <label>Location Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="location_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="location_phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="location_extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <label>Location Fax</label>    
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="location_fax_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="location_fax" placeholder="Fax Number">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-contact">
+
+                <div class="form-group">
+                    <label>Primary Contact <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                        </div>
+                        <input type="text" class="form-control" id="primaryContact" name="contact" placeholder="Primary Contact Person" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Title</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200">
+                    </div>
+                </div>
+
+                <label>Contact Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="contact_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="contact_phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="contact_extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <label>Mobile</label>    
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="contact_mobile_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="contact_mobile" placeholder="Mobile Phone Number">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Contact Email</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="contact_email" placeholder="Contact's Email Address" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <?php if ($config_module_enable_accounting) { ?>
+
+                <div class="tab-pane fade" id="pills-billing">
+
+                    <div class="form-group">
+                        <label>Hourly Rate</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Currency <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                            </div>
+                            <select class="form-control select2" name="currency_code" required>
+                                <option value="">- Select Currency -</option>
+                                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Payment Terms</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <select class="form-control select2" name="net_terms">
+                                <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
+                                    <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Tax ID</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="tax_id_number" placeholder="Tax ID Number" maxlength="255">
+                        </div>
+                    </div>
+
+                </div>
+
+            <?php } ?>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="10" name="notes" placeholder="Enter some notes"></textarea>
+                </div>
+            </div>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
+    </div>
+</form>
 
 <script>
     // Checks/prompts that the primary contact field (required) is populated
@@ -383,3 +394,23 @@
         }
     }
 </script>
+
+<script>
+    // Checks for duplicate clients
+    function client_duplicate_check() {
+        var name = document.getElementById("client_name").value;
+        //Send a GET request to ajax.php as ajax.php?client_duplicate_check=true&name=NAME
+        jQuery.get(
+            "ajax.php",
+            {client_duplicate_check: 'true', name: name},
+            function(data) {
+                //If we get a response from ajax.php, parse it as JSON
+                const client_duplicate_data = JSON.parse(data);
+                document.getElementById("client_duplicate_info").innerHTML = client_duplicate_data.message;
+            }
+        );
+    }
+</script>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_bulk_add_ticket.php

@@ -0,0 +1,137 @@
+<div class="modal" id="bulkAddTicketModal" tabindex="-1">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Creating Tickets for Clients</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label>Subject <strong class="text-danger">*</strong></label>
+                    <input type="text" class="form-control" name="bulk_subject" placeholder="Enter a subject" maxlength="200">
+                </div>
+
+                <div class="form-group">
+                    <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
+                </div>
+
+                <div class="row">
+                                
+                    <div class="col">
+                        <div class="form-group">
+                            <label>Priority <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                                </div>
+                                <select class="form-control select2" name="bulk_priority">
+                                    <option>Low</option>
+                                    <option>Medium</option>
+                                    <option>High</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col">
+                        <div class="form-group">
+                            <label>Category</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
+                                </div>
+                                <select class="form-control select2" name="bulk_category">
+                                    <option value="0">- Not Categorized -</option>
+                                    <?php
+                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL");
+                                    while ($row = mysqli_fetch_array($sql_categories)) {
+                                        $category_id = intval($row['category_id']);
+                                        $category_name = nullable_htmlentities($row['category_name']);
+
+                                        ?>
+                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                                    <?php } ?>
+
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="row">
+                    <div class="col">
+
+                        <div class="form-group">
+                            <label>Assign to</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                                </div>
+                                <select class="form-control select2" name="bulk_assigned_to">
+                                    <option value="0">Not Assigned</option>
+                                    <?php
+
+                                    $sql = mysqli_query(
+                                        $mysqli,
+                                        "SELECT user_id, user_name FROM users
+                                        WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                    );
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $user_id = intval($row['user_id']);
+                                        $user_name = nullable_htmlentities($row['user_name']); ?>
+                                        <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col">
+
+                        <div class="form-group">
+                            <label>Project</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                                </div>
+                                <select class="form-control select2" name="bulk_project">
+                                    <option value="0">- None -</option>
+                                    <?php
+
+                                    $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+                                    while ($row = mysqli_fetch_array($sql_projects)) {
+                                        $project_id_select = intval($row['project_id']);
+                                        $project_name_select = nullable_htmlentities($row['project_name']); ?>
+                                        <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
+
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <?php if ($config_module_enable_accounting) { ?>
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
+                        <label class="custom-control-label" for="billableSwitch">Billable</label>
+                    </div>
+                </div>
+                <?php } ?>
+
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_add_client_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+            </div>
+            
+        </div>
+    </div>
+</div>

agent/modals/client/client_bulk_edit_hourly_rate.php

@@ -23,7 +23,7 @@
             </div>
 
             <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_hourly_rate" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
+                <button type="submit" name="bulk_edit_client_hourly_rate" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>

agent/modals/client/client_bulk_edit_industry.php

@@ -23,7 +23,7 @@
             </div>
 
             <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_industry" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
+                <button type="submit" name="bulk_edit_client_industry" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>

agent/modals/client/client_bulk_edit_referral.php

@@ -28,10 +28,8 @@
 
                         </select>
                         <div class="input-group-append">
-                            <button class="btn btn-secondary" type="button"
-                                data-toggle="ajax-modal"
-                                data-modal-size="sm"
-                                data-ajax-url="ajax/ajax_category_add.php?category=Referral">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="/admin/modals/category/category_add.php?category=Referral">
                                 <i class="fas fa-fw fa-plus"></i>
                             </button>
                         </div>
@@ -41,7 +39,7 @@
             </div>
 
             <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_referral" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
+                <button type="submit" name="bulk_edit_client_referral" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>

agent/modals/contact/contact_add.php

@@ -1,303 +1,352 @@
-<div class="modal" id="addContactModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New Contact</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+if ($client_id) {
+     $sql_location_select = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+} else {
+    $sql_client_select = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+}   
+
+$sql_tags_select = mysqli_query($mysqli, "SELECT tag_id, tag_name FROM tags WHERE tag_type = 3 ORDER BY tag_name ASC");
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New Contact</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fas fa-fw fa-user mr-2"></i>Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-photo"><i class="fas fa-fw fa-image mr-2"></i>Photo</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-access"><i class="fas fa-fw fa-lock mr-2"></i>Access</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes"><i class="fas fa-fw fa-edit mr-2"></i>Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details">
+
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php } else { ?>
+
+                    <div class="form-group">
+                        <label>Client <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                            </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
+
+                                while ($row = mysqli_fetch_array($sql_client_select)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id_select == $client_id) { echo "selected"; } ?> value="<?= $client_id_select ?>"><?= $client_name ?></option>
+
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="contact_primary" value="1">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Title</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="title" placeholder="Job Title" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Department / Group</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="department" placeholder="Department or group" maxlength="200">
+                    </div>
+                </div>
+
+                <label>Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <label>Mobile</label>    
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="mobile_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="mobile" placeholder="Mobile Phone Number">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Email</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200">
+                    </div>
+                </div>
+
+                <?php if($client_id) { ?>
+                <div class="form-group">
+                    <label>Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_location_select)) {
+                                $location_id = intval($row['location_id']);
+                                $location_name = nullable_htmlentities($row['location_name']);
+                            ?>
+                                <option value="<?= $location_id ?>"><?= $location_name ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
             </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <div class="modal-body">
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fa fa-fw fa-user mr-2"></i>Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-photo"><i class="fa fa-fw fa-image mr-2"></i>Photo</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-access"><i class="fa fa-fw fa-lock mr-2"></i>Access</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes"><i class="fa fa-fw fa-edit mr-2"></i>Notes</a>
-                        </li>
-                    </ul>
+            <div class="tab-pane fade" id="pills-photo">
 
-                    <hr>
+                <div class="form-group">
+                    <label>Upload Photo</label>
+                    <input type="file" class="form-control-file" name="file" accept="image/*">
+                </div>
 
-                    <div class="tab-content">
+            </div>
 
-                        <div class="tab-pane fade show active" id="pills-details">
+            <div class="tab-pane fade" id="pills-access">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
-
-                                <div class="form-group">
-                                    <label>Client <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
-
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="contact_primary" value="1">
-                                        </div>
-                                    </div>
+                <div class="form-group">
+                    <label>Pin</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="pin" placeholder="Security code or pin" maxlength="255">
+                    </div>
+                </div>
+                <?php if ($config_client_portal_enable == 1) { ?>
+                    <div class="authForm">
+                        <div class="form-group">
+                            <label>Client Portal</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
                                 </div>
+                                <select class="form-control select2 authMethod" name="auth_method">
+                                    <option value="">- No Access -</option>
+                                    <option value="local">Using Set Password</option>
+                                    <option value="azure">Using Azure Credentials</option>
+                                </select>
                             </div>
-
-                            <div class="form-group">
-                                <label>Title</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="title" placeholder="Job Title" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Department / Group</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="department" placeholder="Department or group" maxlength="200">
-                                </div>
-                            </div>
-
-                            <label>Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <label>Mobile</label>    
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="mobile_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="mobile" placeholder="Mobile Phone Number">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Email</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200">
-                                </div>
-                            </div>
-
-                            <?php if($client_url) { ?>
-                            <div class="form-group">
-                                <label>Location</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="location">
-                                        <option value="">- Select Location -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $location_id = intval($row['location_id']);
-                                            $location_name = nullable_htmlentities($row['location_name']);
-                                        ?>
-                                            <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-
                         </div>
 
-                        <div class="tab-pane fade" id="pills-photo">
-
-                            <div class="form-group">
-                                <label>Upload Photo</label>
-                                <input type="file" class="form-control-file" name="file" accept="image/*">
+                        <div class="form-group passwordGroup" style="display: none;">
+                            <label>Password</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                                </div>
+                                <input type="password" class="form-control" data-toggle="password" id="password-add" name="contact_password" placeholder="Password" autocomplete="new-password">
+                                <div class="input-group-append">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                                </div>
+                                <div class="input-group-append">
+                                    <button type="button" class="btn btn-default" onclick="generatePassword('add')">
+                                        <i class="fa fa-fw fa-question"></i>
+                                    </button>
+                                </div>
                             </div>
-
                         </div>
+                    </div>
+                <?php } ?>
+                
+                <label>Roles:</label>
+                <div class="form-row">
 
-                        <div class="tab-pane fade" id="pills-access">
-
-                            <div class="form-group">
-                                <label>Pin</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="pin" placeholder="Security code or pin" maxlength="255">
-                                </div>
+                    <div class="col-md-4">
+                        <div class="form-group">
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1">
+                                <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                                <p class="text-secondary"><small>Pin Top</small></p>
                             </div>
-                            <?php if ($config_client_portal_enable == 1) { ?>
-                                <div class="authForm">
-                                    <div class="form-group">
-                                        <label>Client Portal</label>
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
-                                            </div>
-                                            <select class="form-control select2 authMethod" name="auth_method">
-                                                <option value="">- No Access -</option>
-                                                <option value="local">Using Set Password</option>
-                                                <option value="azure">Using Azure Credentials</option>
-                                            </select>
-                                        </div>
-                                    </div>
-
-                                    <div class="form-group passwordGroup" style="display: none;">
-                                        <label>Password</label>
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                            </div>
-                                            <input type="password" class="form-control" data-toggle="password" id="password-add" name="contact_password" placeholder="Password" autocomplete="new-password">
-                                            <div class="input-group-append">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                            </div>
-                                            <div class="input-group-append">
-                                                <button type="button" class="btn btn-default" onclick="generatePassword('add')">
-                                                    <i class="fa fa-fw fa-question"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            <?php } ?>
-                            
-                            <label>Roles:</label>
-                            <div class="form-row">
-
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1">
-                                            <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
-                                            <p class="text-secondary"><small>Pin Top</small></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1">
-                                            <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
-                                            <p class="text-secondary"><small>Receives Invoices</small></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1">
-                                            <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
-                                            <p class="text-secondary"><small>Access </small></p>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
                         </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="form-group">
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1">
+                                <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                                <p class="text-secondary"><small>Receives Invoices</small></p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="form-group">
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1">
+                                <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                                <p class="text-secondary"><small>Access </small></p>
                             </div>
-
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
-                                        <?php
-
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 3 ORDER BY tag_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                            $tag_id_select = intval($row['tag_id']);
-                                            $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                            ?>
-                                            <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/tag/tag_add.php?type=3">
-                                            <i class="fas fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
                         </div>
-
                     </div>
 
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id = intval($row['tag_id']);
+                                $tag_name = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?= $tag_id ?>"><?= $tag_name ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=3">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+<!-- JavaScript to Show/Hide Password Form Group -->
+<script>
+
+function generatePassword(type, id) {
+    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+    jQuery.get(
+        "ajax.php", {
+            get_readable_pass: 'true'
+        },
+        function(data) {
+            //If we get a response from post.php, parse it as JSON
+            const password = JSON.parse(data);
+
+            // Set the password value to the correct modal, based on the type
+            if (type == "add") {
+                document.getElementById("password-add").value = password;
+            } else if (type == "edit") {
+                document.getElementById("password-edit-"+id.toString()).value = password;
+            }
+        }
+    );
+}
+
+$(document).ready(function() {
+    $('.authMethod').on('change', function() {
+        var $form = $(this).closest('.authForm');
+        if ($(this).val() === 'local') {
+            $form.find('.passwordGroup').show();
+        } else {
+            $form.find('.passwordGroup').hide();
+        }
+    });
+    $('.authMethod').trigger('change');
+
+});
+</script>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_details.php

@@ -35,6 +35,18 @@ $contact_technical = intval($row['contact_technical']);
 $contact_created_at = nullable_htmlentities($row['contact_created_at']);
 $contact_location_id = intval($row['contact_location_id']);
 $location_name = nullable_htmlentities($row['location_name']);
+$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']);
+$location_phone_country_code = nullable_htmlentities($row['location_phone_country_code']);
+$location_phone = nullable_htmlentities(formatPhoneNumber($row['location_phone'], $location_phone_country_code));
+if (empty($location_phone)) {
+    $location_phone_display = "-";
+} else {
+    $location_phone_display = $location_phone;
+}
 $auth_method = nullable_htmlentities($row['user_auth_method']);
 $contact_client_id = intval($row['contact_client_id']);
 
@@ -153,7 +165,23 @@ if (isset($_GET['client_id'])) {
 ob_start();
 ?>
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i><strong><?php echo $contact_name; ?></strong></h5>
+    <h5 class="modal-title">
+        <div class="media">
+            <?php if ($contact_photo) { ?>
+                <img class="img-thumbnail img-circle img-size-50 mr-1" src="<?= "../uploads/clients/$client_id/$contact_photo" ?>">
+            <?php } else { ?>
+                <span class="fa-stack">
+                    <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                    <span class="fa fa-stack-1x text-white"><?= $contact_initials ?></span>
+                </span>
+            <?php } ?>
+
+            <div class="media-body ml-2">
+                <strong><?= $contact_name ?></strong>
+                <div class="text-sm"><?= $contact_title ?></div>
+            </div>
+        </div>
+    </h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -161,142 +189,133 @@ ob_start();
 
 <div class="modal-body">
 
-    <ul class="nav nav-pills nav-justified mb-3">
-        <li class="nav-item">
-            <a class="nav-link active" data-toggle="pill" href="#pills-contact-details<?php echo $contact_id; ?>"><i class="fas fa-fw fa-user fa-2x"></i><br>Details</a>
-        </li>
+    <div class="row">
+
+        <?php if ($contact_phone || $contact_mobile || $contact_extension || $contact_email) { ?>
+            <div class="col-4">
+                <div class="media">
+                    <i class="fas fa-fw fa-user fa-2x text-secondary"></i>
+                    <div class="media-body ml-2">
+                        <dt>Contact Details</dt>
+                        <?php if ($contact_phone) { ?>
+                        <div>
+                            <i class="fas fa-fw fa-phone-alt text-secondary mt-2"></i>
+                            <a href="tel:<?= $contact_phone ?>"><?= $contact_phone ?></a>
+                            <?php if ($contact_extension) { ?>
+                            <span>ext: <?= $contact_extension ?></span>
+                            <?php } ?>
+                        </div>
+                        <?php } ?>
+        
+                        <?php if ($contact_mobile) { ?>
+                        <div>
+                            <i class="fas fa-fw fa-mobile-alt text-secondary mt-2"></i>
+                            <a href="tel:<?= $contact_mobile ?>"><?= $contact_mobile ?></a>
+                        </div>
+                        <?php } ?>
+                        <?php if ($contact_email) { ?>
+                        <div>
+                            <i class="fas fa-fw fa-envelope text-secondary mt-2"></i>
+                            <a href='mailto:<?= $contact_email ?>'><?= $contact_email ?></a>
+                            <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?= $contact_email ?>'>
+                            <i class='far fa-copy text-secondary'></i></button>
+                        </div>
+                        <?php } ?>
+                    </div>
+                </div>
+            </div>
+        <?php } ?>
+
+        <?php if ($location_name) { ?>
+            <div class="col-4">
+                <div class="media">
+                    <i class="fas fa-fw fa-map-marker-alt text-secondary fa-2x"></i>
+                    <div class="media-body ml-2">
+                        <dt><?= $location_name ?></dt>
+                        <dd>   
+                            <div><?= $location_address ?></div>
+                            <div><?= "$location_city $location_state $location_zip" ?></div>
+                            <div><?= $location_country ?></div> 
+                        </dd>
+                    </div>
+                </div>
+            </div>
+        <?php } ?>
+
+        <div class="col-4">
+            <div class="media">
+                <i class="fa fa-fw fa-info-circle text-secondary fa-2x"></i>
+                <div class="media-body ml-2">
+                    <?php if ($contact_primary) { ?>
+                        <span class="text-success text-bold">Primary Contact</span><br>
+                    <?php } ?>
+                    <?php if ($contact_billing) { ?>
+                        <span class="text-dark font-weight-bold">Billing</span><br>
+                    <?php } ?>
+                    <?php if ($contact_technical) { ?>
+                        <span class="text-secondary">Technical</span><br>
+                    <?php } ?>
+                    <?php if ($contact_important) { ?>
+                        <span class="text-dark font-weight-bold">Important</span>
+                    <?php } ?>
+                    <?php if ($contact_pin) { ?>
+                        <div>
+                            Pin: <?= $contact_pin ?>
+                        </div>
+                    <?php } ?>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <ul class="nav nav-pills nav-justified mt-3">
         <?php if ($asset_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-assets<?php echo $contact_id; ?>"><i class="fas fa-fw fa-desktop fa-2x"></i><br>Assets (<?php echo $asset_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-assets<?= $contact_id ?>"><i class="fas fa-fw fa-desktop fa-2x"></i><br>Assets (<?= $asset_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($credential_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-credentials<?php echo $contact_id; ?>"><i class="fas fa-fw fa-key fa-2x"></i><br>Credentials (<?php echo $credential_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-credentials<?= $contact_id ?>"><i class="fas fa-fw fa-key fa-2x"></i><br>Credentials (<?= $credential_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($software_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-licenses<?php echo $contact_id; ?>"><i class="fas fa-fw fa-cube fa-2x"></i><br>Licenses (<?php echo $software_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-licenses<?= $contact_id ?>"><i class="fas fa-fw fa-cube fa-2x"></i><br>Licenses (<?= $software_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($ticket_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-tickets<?php echo $contact_id; ?>"><i class="fas fa-fw fa-life-ring fa-2x"></i><br>Tickets (<?php echo $ticket_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-tickets<?= $contact_id ?>"><i class="fas fa-fw fa-life-ring fa-2x"></i><br>Tickets (<?= $ticket_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($recurring_ticket_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-recurring-tickets<?php echo $contact_id; ?>"><i class="fas fa-fw fa-redo-alt fa-2x"></i><br>Rcr Tickets (<?php echo $recurring_ticket_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-recurring-tickets<?= $contact_id ?>"><i class="fas fa-fw fa-redo-alt fa-2x"></i><br>Rcr Tickets (<?= $recurring_ticket_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($document_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-documents<?php echo $contact_id; ?>"><i class="fas fa-fw fa-file-alt fa-2x"></i><br>Documents (<?php echo $document_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-documents<?= $contact_id ?>"><i class="fas fa-fw fa-file-alt fa-2x"></i><br>Documents (<?= $document_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($file_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-files<?php echo $contact_id; ?>"><i class="fas fa-fw fa-briefcase fa-2x"></i><br>Files (<?php echo $file_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-files<?= $contact_id ?>"><i class="fas fa-fw fa-briefcase fa-2x"></i><br>Files (<?= $file_count ?>)</a>
         </li>
         <?php } ?>
         <?php if ($note_count) { ?>
         <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pills-contact-notes<?php echo $contact_id; ?>"><i class="fas fa-fw fa-edit fa-2x"></i><br>Notes (<?php echo $note_count; ?>)</a>
+            <a class="nav-link" data-toggle="pill" href="#pills-contact-notes<?= $contact_id ?>"><i class="fas fa-fw fa-edit fa-2x"></i><br>Notes (<?= $note_count ?>)</a>
         </li>
         <?php } ?>
     </ul>
 
-    <hr>
-
     <div class="tab-content">
 
-        <div class="tab-pane fade show active" id="pills-contact-details<?php echo $contact_id; ?>">
-            <div class="card card-dark">
-                <div class="card-body">
-                    <h3 class="text-bold"><?php echo $contact_name; ?></h3>
-                    <?php if ($contact_title) { ?>
-                        <div class="text-secondary"><?php echo $contact_title; ?></div>
-                    <?php } ?>
-
-                    <div class="text-center">
-                        <?php if ($contact_photo) { ?>
-                            <img class="img-thumbnail img-circle col-3" alt="contact_photo" src="<?php echo "../uploads/clients/$client_id/$contact_photo"; ?>">
-                        <?php } else { ?>
-                            <span class="fa-stack fa-4x">
-                                <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                                <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
-                            </span>
-                        <?php } ?>
-                    </div>
-                    <?php
-                    if (!empty($contact_tags_display)) { ?>
-                        <div class="mt-1">
-                            <?php echo $contact_tags_display; ?>
-                        </div>
-                    <?php } ?>
-                    <hr>
-                    <?php if ($location_name) { ?>
-                        <div><i class="fa fa-fw fa-map-marker-alt text-secondary mr-2"></i><?php echo $location_name; ?></div>
-                    <?php }
-                    if ($contact_email) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href='mailto:<?php echo $contact_email; ?>'><?php echo $contact_email; ?></a><button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button></div>
-                    <?php }
-                    if ($contact_phone) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-phone text-secondary mr-2"></i><a href="tel:<?php echo "$contact_phone"?>"><?php echo $contact_phone; ?></a></div>
-                    <?php }
-                    if ($contact_extension) { ?>
-                        <div class="ml-4">x<?php echo $contact_extension; ?></div>
-                    <?php }
-                    if ($contact_mobile) { ?>
-                        <div class="mt-l"><i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><a href="tel:<?php echo $contact_mobile; ?>"><?php echo $contact_mobile; ?></a></div>
-                    <?php }
-                    if ($contact_pin) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-key text-secondary mr-2"></i><?php echo $contact_pin; ?></div>
-                    <?php }
-                    if ($contact_primary) { ?>
-                        <div class="mt-2 text-success"><i class="fa fa-fw fa-check mr-2"></i>Primary Contact</div>
-                    <?php }
-                    if ($contact_important) { ?>
-                        <div class="mt-2 text-dark text-bold"><i class="fa fa-fw fa-check mr-2"></i>Important</div>
-                    <?php }
-                    if ($contact_technical) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-2"></i>Technical</div>
-                    <?php }
-                    if ($contact_billing) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-check text-secondary mr-2"></i>Billing</div>
-                    <?php } ?>
-                    <div class="mt-2"><i class="fa fa-fw fa-clock text-secondary mr-2"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
-
-                </div>
-            </div>
-
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="card-title">Notes</h5>
-                </div>
-                <textarea class="form-control" rows=6 id="contactNotes" placeholder="Notes, eg Personal tidbits to spark convo, temperment, etc" onblur="updateContactNotes(<?php echo $contact_id ?>)"><?php echo $contact_notes ?></textarea>
-            </div>
-        </div>
-
-        <script>
-            function updateContactNotes(contact_id) {
-                var notes = document.getElementById("contactNotes").value;
-
-                // Send a POST request to ajax.php as ajax.php with data contact_set_notes=true, contact_id=NUM, notes=NOTES
-                jQuery.post(
-                    "ajax.php",
-                    {
-                        contact_set_notes: 'TRUE',
-                        contact_id: contact_id,
-                        notes: notes
-                    }
-                )
-            }
-        </script>
-
         <?php if ($asset_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-assets<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-assets<?= $contact_id ?>">
 
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
@@ -361,28 +380,26 @@ ob_start();
                         ?>
                         <tr>
                             <th>
-                                <i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
-                                <a class="text-secondary" href="#"
-                                    data-toggle="ajax-modal"
+                                <i class="fa fa-fw text-secondary fa-<?= $device_icon ?> mr-2"></i>
+                                <a href="#" class="ajax-modal"
                                     data-modal-size="lg"
-                                    data-ajax-url="ajax/ajax_asset_details.php"
-                                    data-ajax-id="<?php echo $asset_id; ?>">
-                                    <?php echo $asset_name; ?>
+                                    data-modal-url="modals/asset/asset_details.php?id=<?= $asset_id ?>">
+                                    <?= $asset_name ?>
                                 </a>
                                 <div class="mt-0">
-                                    <small class="text-muted"><?php echo $asset_description; ?></small>
+                                    <small class="text-muted"><?= $asset_description ?></small>
                                 </div>
                             </th>
-                            <td><?php echo $asset_type; ?></td>
+                            <td><?= $asset_type ?></td>
                             <td>
-                                <?php echo $asset_make; ?>
+                                <?= $asset_make ?>
                                 <div class="mt-0">
-                                    <small class="text-muted"><?php echo $asset_model; ?></small>
+                                    <small class="text-muted"><?= $asset_model ?></small>
                                 </div>
                             </td>
-                            <td><?php echo $asset_serial_display; ?></td>
-                            <td><?php echo $asset_install_date_display; ?></td>
-                            <td><?php echo $asset_status; ?></td>
+                            <td><?= $asset_serial_display ?></td>
+                            <td><?= $asset_install_date_display ?></td>
+                            <td><?= $asset_status ?></td>
                         </tr>
 
                         <?php
@@ -398,7 +415,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($credential_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-credentials<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-credentials<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm dataTables" style="width:100%">
                     <thead>
@@ -468,16 +485,16 @@ ob_start();
 
                         ?>
                         <tr>
-                            <td><i class="fa fa-fw fa-key text-secondary mr-2"></i><?php echo $credential_name; ?></td>
-                            <td><?php echo $credential_description; ?></td>
-                            <td><?php echo $credential_username_display; ?></td>
+                            <td><i class="fa fa-fw fa-key text-secondary mr-2"></i><?= $credential_name ?></td>
+                            <td><?= $credential_description ?></td>
+                            <td><?= $credential_username_display ?></td>
                             <td>
-                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $credential_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button>
+                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?= $credential_password ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button>
 
-                                <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $credential_password; ?>'><i class='far fa-copy text-secondary'></i></button>
+                                <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?= $credential_password ?>'><i class='far fa-copy text-secondary'></i></button>
                             </td>
-                            <td><?php echo $otp_display; ?></td>
-                            <td><?php echo $credential_uri_display; ?></td>
+                            <td><?= $otp_display ?></td>
+                            <td><?= $credential_uri_display ?></td>
                         </tr>
 
                         <?php
@@ -495,7 +512,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($ticket_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-tickets<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-tickets<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -557,13 +574,13 @@ ob_start();
                         ?>
 
                         <tr>
-                            <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-                            <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-                            <td><?php echo $ticket_priority_display; ?></td>
-                            <td><span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span></td>
-                            <td><?php echo $ticket_assigned_to_display; ?></td>
-                            <td><?php echo $ticket_updated_at_display; ?></td>
-                            <td><?php echo $ticket_created_at; ?></td>
+                            <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><span class="badge badge-pill badge-secondary p-3"><?= "$ticket_prefix$ticket_number" ?></span></a></td>
+                            <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_subject ?></a></td>
+                            <td><?= $ticket_priority_display ?></td>
+                            <td><span class='badge badge-pill text-light p-2' style="background-color: <?= $ticket_status_color ?>"><?= $ticket_status_name ?></span></td>
+                            <td><?= $ticket_assigned_to_display ?></td>
+                            <td><?= $ticket_updated_at_display ?></td>
+                            <td><?= $ticket_created_at ?></td>
                         </tr>
 
                         <?php
@@ -579,7 +596,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($recurring_ticket_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-recurring-tickets<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-recurring-tickets<?= $contact_id ?>">
 
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
@@ -603,10 +620,10 @@ ob_start();
                     ?>
 
                         <tr>
-                            <td class="text-bold"><?php echo $recurring_ticket_subject ?></td>
-                            <td><?php echo $recurring_ticket_priority ?></td>
-                            <td><?php echo $recurring_ticket_frequency ?></td>
-                            <td><?php echo $recurring_ticket_next_run ?></td>
+                            <td class="text-bold"><?= $recurring_ticket_subject ?></td>
+                            <td><?= $recurring_ticket_priority ?></td>
+                            <td><?= $recurring_ticket_frequency ?></td>
+                            <td><?= $recurring_ticket_next_run ?></td>
                         </tr>
 
                     <?php } ?>
@@ -618,7 +635,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($software_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-licenses<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-licenses<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -668,10 +685,10 @@ ob_start();
 
                         ?>
                         <tr>
-                            <td><?php echo "$software_name $software_version"; ?></td>
-                            <td><?php echo $software_type; ?></td>
-                            <td><?php echo $software_key; ?></td>
-                            <td><?php echo "$seat_count / $software_seats"; ?></td>
+                            <td><?= "$software_name $software_version" ?></td>
+                            <td><?= $software_type ?></td>
+                            <td><?= $software_key ?></td>
+                            <td><?= "$seat_count / $software_seats" ?></td>
                         </tr>
 
                         <?php
@@ -687,7 +704,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($document_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-documents<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-documents<?= $contact_id ?>">
 
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
@@ -721,11 +738,11 @@ ob_start();
                                     data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
                                     <?php echo $document_name; ?>
                                 </a>
-                                <div class="text-secondary"><?php echo $document_description; ?></div>
+                                <div class="text-secondary"><?= $document_description ?></div>
                             </td>
-                            <td><?php echo $document_created_by; ?></td>
-                            <td><?php echo $document_created_at; ?></td>
-                            <td><?php echo $document_updated_at; ?></td>
+                            <td><?= $document_created_by ?></td>
+                            <td><?= $document_created_at ?></td>
+                            <td><?= $document_updated_at ?></td>
                         </tr>
 
                         <?php
@@ -741,7 +758,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($file_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-files<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-files<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -771,12 +788,12 @@ ob_start();
 
                         <tr>
                             <td>
-                                <div><a href="../uploads/clients/<?php echo $client_id; ?>/<?php echo $file_reference_name; ?>"><?php echo $file_name; ?></a></div>
-                                <div class="text-secondary"><?php echo $file_description; ?></div>
+                                <div><a href="../uploads/clients/<?= $client_id ?>/<?= $file_reference_name ?>" target="_blank"><?= $file_name ?></a></div>
+                                <div class="text-secondary"><?= $file_description ?></div>
                             </td>
-                            <td><?php echo $file_mime_type; ?></td>
-                            <td><?php echo $file_size_KB; ?> KB</td>
-                            <td><?php echo $file_created_at; ?></td>
+                            <td><?= $file_mime_type ?></td>
+                            <td><?= $file_size_KB ?> KB</td>
+                            <td><?= $file_created_at ?></td>
                         </tr>
 
                         <?php
@@ -819,10 +836,10 @@ ob_start();
                         ?>
 
                         <tr>
-                            <td><i class="fa fa-fw <?php echo $note_type_icon; ?> mr-2"></i><?php echo $contact_note_type; ?></td>
-                            <td><?php echo $contact_note; ?></td>
-                            <td><?php echo $note_by; ?></td>
-                            <td><?php echo $contact_note_created_at; ?></td>
+                            <td><i class="fa fa-fw <?= $note_type_icon ?> mr-2"></i><?= $contact_note_type ?></td>
+                            <td><?= $contact_note ?></td>
+                            <td><?= $note_by ?></td>
+                            <td><?= $contact_note_created_at ?></td>
                         </tr>
 
                         <?php
@@ -842,14 +859,13 @@ ob_start();
 </div>
 
 <div class="modal-footer">
-    <a href="contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>" class="btn btn-primary text-bold">
-        <span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span>
+    <a href="contact_details.php?client_id=<?= $client_id ?>&contact_id=<?= $contact_id ?>" class="btn btn-outline-primary">
+        <i class="fas fa-info-circle mr-2"></i>More Details
     </a>
-    <a href="#" class="btn btn-secondary" 
-        data-toggle="ajax-modal" data-ajax-url="ajax/ajax_contact_edit.php" data-ajax-id="<?php echo $contact_id; ?>">
-        <span class="text-white"><i class="fas fa-edit mr-2"></i>Edit</span>
+    <a href="#" class="btn btn-secondary ajax-modal" 
+        data-modal-url="modals/contact/contact_edit.php?id=<?= $contact_id ?>">
+        <i class="fas fa-edit mr-2"></i>Edit
     </a>
-    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
 </div>
 
 <?php

agent/modals/credential/credential_import.php

@@ -12,7 +12,7 @@
 				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 				<?php } ?>
 				<div class="modal-body">
-					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, URL</p>
+					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, TOTP, URI</p>
 					<hr>
 					<div class="form-group my-4">
 						<input type="file" class="form-control-file" name="file" accept=".csv" required>

agent/modals/recurring_ticket/recurring_ticket_add.php

@@ -113,7 +113,7 @@
                                         $sql = mysqli_query(
                                             $mysqli,
                                             "SELECT user_id, user_name FROM users
-                                            WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                            WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
                                         );
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $user_id = intval($row['user_id']);
@@ -190,11 +190,17 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                                     </div>
                                     <select class="form-control select2" name="frequency" required>
-                                        <option>Weekly</option>
-                                        <option>Monthly</option>
-                                        <option>Quarterly</option>
-                                        <option>Biannually</option>
-                                        <option>Annually</option>
+                                        <optgroup label="Days">
+                                            <option>Three Days</option>
+                                            <option>Weekly</option>
+                                            <option>Biweekly</option>
+                                        </optgroup>
+                                        <optgroup label="Months">
+                                            <option>Monthly</option>
+                                            <option>Quarterly</option>
+                                            <option>Biannually</option>
+                                            <option>Annually</option>
+                                        </optgroup>
                                     </select>
                                 </div>
                             </div>
@@ -223,21 +229,46 @@
                                         </div>
                                         <select class="form-control select2" name="asset">
                                             <option value="0">- None -</option>
+
                                             <?php
-                                            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                            // Query assets ordered by type, then name
+                                            $sql_assets = mysqli_query($mysqli, "
+                                                SELECT asset_id, asset_name, asset_type, asset_make, asset_model, contact_name 
+                                                FROM assets 
+                                                LEFT JOIN contacts ON contact_id = asset_contact_id 
+                                                WHERE asset_client_id = $client_id 
+                                                  AND asset_archived_at IS NULL 
+                                                ORDER BY asset_type ASC, asset_name ASC
+                                            ");
+
+                                            $current_type = null; // Track which optgroup we're in
 
                                             while ($row = mysqli_fetch_array($sql_assets)) {
                                                 $asset_id_select = intval($row['asset_id']);
                                                 $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                                $asset_type_select = nullable_htmlentities($row['asset_type']);
+                                                $asset_make_select = nullable_htmlentities($row['asset_make']);
+                                                $asset_model_select = nullable_htmlentities($row['asset_model']);
+                                                $contact_name_select = nullable_htmlentities($row['contact_name']);
+                                                
+                                                // Start new optgroup if type changes
+                                                if ($asset_type_select !== $current_type) {
+                                                    if ($current_type !== null) echo "</optgroup>";
+                                                    echo "<optgroup label=\"" . ($asset_type_select ?: 'Uncategorized') . "\">";
+                                                    $current_type = $asset_type_select;
+                                                }
+
+                                                // Build full display
+                                                $full_name = $asset_name_select . ($asset_make_select ? " - $asset_make_select" . ($asset_model_select ? " $asset_model_select" : '') : '') 
+                                                             . ($contact_name_select ? " - ($contact_name_select)" : '');
                                                 ?>
-                                                <option value="<?php echo $asset_id_select; ?>"
-                                                    <?php if (isset($_GET['asset_id']) && $asset_id_select == $_GET['asset_id']) { echo "selected"; }
-                                                    ?>
 
-                                                    ><?php echo $asset_name_select; ?>
-                                                </option>
+                                                <option value="<?= $asset_id_select ?>"><?= $full_name ?></option>
 
-                                            <?php } ?>
+                                            <?php } 
+
+                                            if ($current_type_select !== null) echo "</optgroup>"; 
+                                            ?>
                                         </select>
                                     </div>
                                 </div>
@@ -250,23 +281,51 @@
                                         </div>
                                         <select class="form-control select2" name="additional_assets[]" data-tags="true" data-placeholder="- Select Additional Assets -" multiple>
                                             <option value=""></option>
-                                            <?php
 
-                                            $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                            <?php
+                                            // Query assets ordered by type then name
+                                            $sql_assets = mysqli_query($mysqli, "
+                                                SELECT asset_id, asset_name, asset_type, asset_make, asset_model, contact_name 
+                                                FROM assets 
+                                                LEFT JOIN contacts ON contact_id = asset_contact_id 
+                                                WHERE asset_client_id = $client_id 
+                                                  AND asset_archived_at IS NULL 
+                                                ORDER BY asset_type ASC, asset_name ASC
+                                            ");
+
+                                            $current_type = null;
+
                                             while ($row = mysqli_fetch_array($sql_assets)) {
                                                 $asset_id_select = intval($row['asset_id']);
                                                 $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                                $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
-                                            ?>
-                                                <option value="<?php echo $asset_id_select; ?>"
-                                                    ><?php echo "$asset_name_select - $asset_contact_name_select"; ?>
-                                                </option>
+                                                $asset_type_select = nullable_htmlentities($row['asset_type']);
+                                                $asset_make_select = nullable_htmlentities($row['asset_make']);
+                                                $asset_model_select = nullable_htmlentities($row['asset_model']);
+                                                $contact_name_select = nullable_htmlentities($row['contact_name']);
 
-                                            <?php } ?>
+                                                // Start new optgroup if type changes
+                                                if ($asset_type_select !== $current_type) {
+                                                    if ($current_type !== null) echo "</optgroup>";
+                                                    echo "<optgroup label=\"" . ($asset_type_select ?: 'Uncategorized') . "\">";
+                                                    $current_type = $asset_type_select;
+                                                }
+
+                                                // Build full display
+                                                $full_name = $asset_name_select . ($asset_make_select ? " - $asset_make_select" . ($asset_model_select ? " $asset_model_select" : '') : '') 
+                                                             . ($contact_name_select ? " - ($contact_name_select)" : '');
+                                                ?>
+
+                                                <option value="<?= $asset_id_select ?>"><?= $full_name ?></option>
+
+                                            <?php } 
+
+                                            if ($current_type !== null) echo "</optgroup>"; 
+                                            ?>
                                         </select>
                                     </div>
                                 </div>
 
+
                             <?php } ?>
 
                         </div>

agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php

@@ -0,0 +1,46 @@
+<div class="modal" id="bulkAssignAgentRecurringTicketModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assigning Agent</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label>Assign Agent</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                        </div>
+                        <select class="form-control select2" name="assign_to">
+                            <option value="0">Not Assigned</option>
+                            <?php
+                            $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
+                                WHERE user_type = 1
+                                AND user_status = 1
+                                AND user_archived_at IS NULL 
+                                ORDER BY user_name DESC"
+                            );
+                            while ($row = mysqli_fetch_array($sql_users_select)) {
+                                $user_id_select = intval($row['user_id']);
+                                $user_name_select = nullable_htmlentities($row['user_name']);
+
+                                ?>
+                                <option value="<?= $user_id_select ?>"><?= $user_name_select ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_assign_recurring_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+
+        </div>
+    </div>
+</div>

agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php

@@ -0,0 +1,29 @@
+<div class="modal" id="bulkEditBillableRecurringTicketModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-money mr-2"></i>Bulk Set Billable</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+                
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="billable" value="1" id="billable<?= $recurring_ticket_id ?>">
+                        <label class="custom-control-label" for="billable<?= $recurring_ticket_id ?>">Mark Billable</label>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_edit_recurring_ticket_billable" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+
+        </div>
+    </div>
+</div>

agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php

@@ -0,0 +1,42 @@
+<div class="modal" id="bulkEditCategoryRecurringTicketModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-layer-group mr-2"></i>Bulk Set Category</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label>Category</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_category">
+                            <option value="0">- Uncategorized -</option>
+                            <?php
+                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql_categories)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+
+                                ?>
+                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_edit_recurring_ticket_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+
+        </div>
+    </div>
+</div>

agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php

@@ -0,0 +1,32 @@
+<div class="modal" id="bulkEditNextRunRecurringTicketModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-calendar-day mr-2"></i>Set Next Run Date</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+                
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label>Next Run Date <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
+                        </div>
+                        <input class="form-control" type="date" name="next_run_date" min="<?= date("Y-m-d"); ?>" max="2999-12-31">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_edit_recurring_ticket_next_run_date" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+
+        </div>
+    </div>
+</div>

agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php

@@ -0,0 +1,36 @@
+<div class="modal" id="bulkEditPriorityRecurringTicketModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Bulk Editing Priority</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+                
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label>Priority</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_priority">
+                            <option>Low</option>
+                            <option>Medium</option>
+                            <option>High</option>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="modal-footer">
+                <button type="submit" name="bulk_edit_recurring_ticket_priority" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            </div>
+
+        </div>
+    </div>
+</div>

agent/modals/recurring_ticket/recurring_ticket_edit.php

@@ -136,7 +136,7 @@ ob_start();
                             $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
                                 WHERE user_type = 1
                                 AND user_archived_at IS NULL
-                                ORDER BY user_name DESC"
+                                ORDER BY user_name ASC"
                             );
                             while ($row = mysqli_fetch_array($sql_users_select)) {
                                 $user_id_select = intval($row['user_id']);
@@ -212,7 +212,9 @@ ob_start();
                             <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                         </div> 
                         <select class="form-control select2" name="frequency">
+                            <option <?php if ($recurring_ticket_frequency == "Three Days") { echo "selected"; } ?>>Three Days</option>
                             <option <?php if ($recurring_ticket_frequency == "Weekly") { echo "selected"; } ?>>Weekly</option>
+                            <option <?php if ($recurring_ticket_frequency == "Biweekly") { echo "selected"; } ?>>Biweekly</option>
                             <option <?php if ($recurring_ticket_frequency == "Monthly") { echo "selected"; } ?>>Monthly</option>
                             <option <?php if ($recurring_ticket_frequency == "Quarterly") { echo "selected"; } ?>>Quarterly</option>
                             <option <?php if ($recurring_ticket_frequency == "Biannually") { echo "selected"; } ?>>Biannually</option>

agent/modals/ticket/ticket_add.php

@@ -185,8 +185,7 @@
                                                 $sql = mysqli_query(
                                                     $mysqli,
                                                     "SELECT user_id, user_name FROM users
-                                                    WHERE user_role_id > 1
-                                                    AND user_type = 1
+                                                    WHERE user_type = 1
                                                     AND user_status = 1
                                                     AND user_archived_at IS NULL
                                                     ORDER BY user_name ASC"

agent/modals/ticket/ticket_add_v2.php

@@ -160,7 +160,7 @@
                                         $sql = mysqli_query(
                                             $mysqli,
                                             "SELECT user_id, user_name FROM users
-                                            WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                            WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
                                         );
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $user_id = intval($row['user_id']);

agent/modals/ticket/ticket_assign.php

@@ -44,11 +44,10 @@ ob_start();
                 <select class="form-control select2" name="assigned_to">
                     <option value="0">Not Assigned</option>
                     <?php
-                    $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
-                        LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                    $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
                         WHERE user_type = 1
                         AND user_archived_at IS NULL
-                        ORDER BY user_name DESC"
+                        ORDER BY user_name ASC"
                     );
                     while ($row = mysqli_fetch_array($sql_users_select)) {
                         $user_id_select = intval($row['user_id']);

agent/modals/ticket/ticket_bulk_assign.php

@@ -22,7 +22,7 @@
                                 WHERE user_type = 1
                                 AND user_status = 1
                                 AND user_archived_at IS NULL 
-                                ORDER BY user_name DESC"
+                                ORDER BY user_name ASC"
                             );
                             while ($row = mysqli_fetch_array($sql_users_select)) {
                                 $user_id_select = intval($row['user_id']);

agent/modals/ticket/ticket_edit_project.php

@@ -0,0 +1,65 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON client_id = ticket_client_id WHERE ticket_id = $ticket_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_project_id = intval($row['ticket_project_id']);
+
+
+// Select box arrays
+$sql_projects = mysqli_query($mysqli, "SELECT project_id, project_name FROM projects WHERE (project_client_id = $client_id OR project_client_id = 0) AND project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Project: <strong><?= "$ticket_prefix$ticket_number" ?></strong> - <?= $client_name ?></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Project</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <select class="form-control select2" name="project">
+                    <option value="0">- None -</option>
+                    <?php
+                    while ($row = mysqli_fetch_array($sql_projects)) {
+                        $project_id = intval($row['project_id']);
+                        $project_name = nullable_htmlentities($row['project_name']); ?>
+                        <option <?php if ($ticket_project_id == $project_id) { echo "selected"; } ?> 
+                            value="<?= $project_id ?>"><?= $project_name ?>
+                        </option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="edit_ticket_project" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/vendor/vendor_details.php

@@ -51,7 +51,7 @@ ob_start();
                 </div>
                 <div class="col-sm-6">
                     <div><strong>Code:</strong> <?php echo getFallback($code); ?></div>
-                    <div><strong>Website:</strong> <?php echo !empty($website) ? '<a href="' . $website . '" target="_blank" class="text-primary">' . $website . '</a>' : '<span class="text-muted">Not Available</span>'; ?></div>
+                    <div><strong>Website:</strong> <?php echo !empty($website) ? '<a href="https://' . $website . '" target="_blank" class="text-primary">' . $website . '</a>' : '<span class="text-muted">Not Available</span>'; ?></div>
                 </div>
             </div>
         </div>

agent/payments.php

@@ -123,34 +123,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

agent/post.php

@@ -26,7 +26,7 @@ $module = str_ireplace('_details', '', $module);
 // Dynamically load admin-related module POST logic
 
 // Load all module POST logic
-//  Loads everything in post/user/
+//  Loads everything in post
 //  Eventually, it would be nice to only specifically load what we need like we do for admins
 
 foreach (glob("post/*.php") as $user_module) {

agent/post/asset.php

@@ -787,10 +787,10 @@ if (isset($_POST["import_assets_csv"])) {
         flash_alert("Bad file size (empty?)", 'error');
     }
 
-    //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location)
+    //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location, notes)
     $f = fopen($file_name, "r");
     $f_columns = fgetcsv($f, 1000, ",");
-    if (!$error & count($f_columns) != 11) {
+    if (!$error & count($f_columns) != 12) {
         $error = true;
         flash_alert("Invalid column count.", 'error');
     }
@@ -884,10 +884,15 @@ if (isset($_POST["import_assets_csv"])) {
                 $physical_location = sanitizeInput($column[10]);
             }
 
+            // Notes (varchar)
+            if (!empty($column[11])) {
+                $notes = sanitizeInput($column[11]);
+            }
+
             // Check if duplicate was detected
             if ($duplicate_detect == 0) {
                 //Add
-                mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id");
+                mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_notes = '$notes', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id");
 
                 $asset_id = mysqli_insert_id($mysqli);
 
@@ -932,7 +937,7 @@ if (isset($_GET['download_assets_csv_template'])) {
     $f = fopen('php://memory', 'w');
 
     //set column headers
-    $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Purchase Date', 'Assigned To', 'Location', 'Physical Location');
+    $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Purchase Date', 'Assigned To', 'Location', 'Physical Location', 'Notes');
     fputcsv($f, $fields, $delimiter);
 
     //move back to beginning of file

agent/post/budget.php

@@ -1,61 +0,0 @@
-<?php
-
-/*
- * ITFlow - GET/POST request handler for budget
- */
-
-defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
-
-
-if (isset($_POST['save_budget'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    enforceUserPermission('module_financial', 2);
-
-    $budgets = $_POST['budget'];
-    $year = intval($_POST['year']);
-
-    foreach ($budgets as $category_id => $months) {
-        foreach ($months as $month => $amount) {
-            $amount = (int)$amount;
-
-            // Check if budget exists
-            $query = "SELECT * FROM budget WHERE budget_category_id = $category_id AND budget_month = $month AND budget_year = $year";
-            $result = mysqli_query($mysqli, $query);
-            if (mysqli_num_rows($result) > 0) {
-                // Update existing budget
-                $query = "UPDATE budget SET budget_amount = $amount WHERE budget_category_id = $category_id AND budget_month = $month AND budget_year = $year";
-            } else {
-                // Insert new budget
-                $query = "INSERT INTO budget SET budget_category_id = $category_id, budget_month = $month, budget_year = $year, budget_amount = $amount";
-            }
-            mysqli_query($mysqli, $query);
-        }
-    }
-
-    logAction("Budget", "Edit", "$session_name edited the budget for $year");
-
-    flash_alert("Budget Updated for $year");
-
-    redirect();
-    
-}
-
-if (isset($_POST['delete_budget'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    enforceUserPermission('module_financial', 3);
-
-    $year = intval($_POST['year']);
-
-    mysqli_query($mysqli,"DELETE FROM budget WHERE budget_year = $year");
-
-    logAction("Budget", "Delete", "$session_name deleted the budget for $year");
-
-    flash_alert("Budget deleted for $year", 'error');
-
-    redirect();
-
-}

agent/post/certificate.php

@@ -120,7 +120,7 @@ if (isset($_GET['archive_certificate'])) {
 
     mysqli_query($mysqli,"UPDATE certificates SET certificate_archived_at = NOW() WHERE certificate_id = $certificate_id");
 
-    logAction("Certificate", "Archive", "$session_name arhvived certificate $certificate_name", $client_id, $certificate_id);
+    logAction("Certificate", "Archive", "$session_name archived certificate $certificate_name", $client_id, $certificate_id);
 
     flash_alert("Certificate <strong>$certificate_name</strong> archived", 'alert');
 

agent/post/client.php

@@ -40,9 +40,9 @@ if (isset($_POST['add_client'])) {
 
     $client_id = mysqli_insert_id($mysqli);
 
-    if (!file_exists("../uploads/clients/$client_id")) {
-        mkdir("../uploads/clients/$client_id");
-        file_put_contents("../uploads/clients/$client_id/index.php", "");
+    if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/uploads/clients/$client_id")) {
+        mkdir($_SERVER['DOCUMENT_ROOT'] . "/uploads/clients/$client_id");
+        file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/uploads/clients/$client_id/index.php", "");
     }
 
     // Create Referral if it doesn't exist
@@ -171,11 +171,20 @@ if (isset($_GET['archive_client'])) {
 
     $client_id = intval($_GET['archive_client']);
 
+    // Archive client
+    mysqli_query($mysqli, "UPDATE clients SET client_archived_at = NOW() WHERE client_id = $client_id");
+
+    // Stop recurring invoices
+    $sql_recurring_invoices = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id AND recurring_invoice_status = 1");
+    while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
+        $recurring_invoice_id = intval($row['recurring_invoice_id']);
+        mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_status = 0 WHERE recurring_invoice_id = $recurring_invoice_id AND recurring_invoice_client_id = $client_id");
+        mysqli_query($mysqli,"INSERT INTO history SET history_status = 0, history_description = 'Recurring Invoice inactive as client archived', history_recurring_invoice_id = $recurring_invoice_id");
+    }
+
     // Get Client Name
     $client_name = sanitizeInput(getFieldById('clients', $client_id, 'client_name'));
 
-    mysqli_query($mysqli, "UPDATE clients SET client_archived_at = NOW() WHERE client_id = $client_id");
-
     logAction("Client", "Archive", "$session_name archived client $client_name", $client_id, $client_id);
 
     flash_alert("Client <strong>$client_name</strong> archived", 'error');
@@ -589,6 +598,120 @@ if (isset($_GET['download_clients_csv_template'])) {
 
 }
 
+if (isset($_POST['bulk_add_client_ticket'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    enforceUserPermission('module_support', 2);
+
+    $assigned_to = intval($_POST['bulk_assigned_to']);
+    if ($assigned_to == 0) {
+        $ticket_status = 1;
+    } else {
+        $ticket_status = 2;
+    }
+    $subject = sanitizeInput($_POST['bulk_subject']);
+    $priority = sanitizeInput($_POST['bulk_priority']);
+    $category_id = intval($_POST['bulk_category']);
+    $details = mysqli_real_escape_string($mysqli, $_POST['bulk_details']);
+    $project_id = intval($_POST['bulk_project']);
+    $use_primary_contact = intval($_POST['use_primary_contact']);
+    $ticket_template_id = intval($_POST['bulk_ticket_template_id']);
+    $billable = intval($_POST['bulk_billable'] ?? 0);
+
+    // Check to see if adding a ticket by template
+    if($ticket_template_id) {
+        $sql = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id");
+        $row = mysqli_fetch_array($sql);
+
+        // Override Template Subject
+        if(empty($subject)) {
+            $subject = sanitizeInput($row['ticket_template_subject']);
+        }
+        $details = mysqli_escape_string($mysqli, $row['ticket_template_details']);
+
+        // Get Associated Tasks from the ticket template
+        $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id");
+
+    }
+
+    // Create ticket for each selected asset
+    if (isset($_POST['client_ids'])) {
+
+        // Get a Asset Count
+        $client_count = count($_POST['client_ids']);
+
+        foreach ($_POST['client_ids'] as $client_id) {
+            $client_id = intval($client_id);
+
+            $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $client_id");
+            $row = mysqli_fetch_array($sql);
+
+            $client_name = sanitizeInput($row['client_name']);
+
+             // Get the next Ticket Number and update the config
+            $sql_ticket_number = mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1");
+            $ticket_number_row = mysqli_fetch_array($sql_ticket_number);
+            $ticket_number = intval($ticket_number_row['config_ticket_next_number']);
+
+            // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php
+            $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
+            $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
+            $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
+            $config_base_url = sanitizeInput($config_base_url);
+
+            //Generate a unique URL key for clients to access
+            $url_key = randomString(156);
+
+            // Increment the config ticket next number
+            $new_config_ticket_next_number = $ticket_number + 1;
+
+            mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
+
+            mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_url_key = '$url_key', ticket_client_id = $client_id, ticket_project_id = $project_id");
+
+            $ticket_id = mysqli_insert_id($mysqli);
+
+            // Update the next ticket number in the database
+            mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
+
+            // Add Tasks
+            if (!empty($_POST['tasks'])) {
+                foreach ($_POST['tasks'] as $task) {
+                    $task_name = sanitizeInput($task);
+                    // Check that task_name is not-empty (For some reason the !empty on the array doesnt work here like in watchers)
+                    if (!empty($task_name)) {
+                        mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id");
+                    }
+                }
+            }
+
+            // Add Tasks from Template if Template was selected
+            if($ticket_template_id) {
+                if (mysqli_num_rows($sql_task_templates) > 0) {
+                    while ($row = mysqli_fetch_array($sql_task_templates)) {
+                        $task_order = intval($row['task_template_order']);
+                        $task_name = sanitizeInput($row['task_template_name']);
+
+                        mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_name', task_order = $task_order, task_ticket_id = $ticket_id");
+                    }
+                }
+            }
+
+            // Custom action/notif handler
+            customAction('ticket_create', $ticket_id);
+        }
+
+        logAction("Ticket", "Bulk Create", "$session_name created $client_count tickets for $client_name");
+
+        flash_alert("<strong>$client_count</strong> tickets created for selected clients");
+
+    }
+
+    redirect();
+
+}
+
 if (isset($_POST['bulk_edit_client_industry'])) {
 
     validateCSRFToken($_POST['csrf_token']);

agent/post/credential.php

@@ -317,8 +317,6 @@ if (isset($_POST['export_credentials_csv'])) {
 
     //get records from database
     $sql = mysqli_query($mysqli,"SELECT * FROM credentials LEFT JOIN clients ON client_id = credential_client_id WHERE credential_archived_at IS NULL $client_query ORDER BY credential_name ASC");
-    $row = mysqli_fetch_array($sql);
-
     $num_rows = mysqli_num_rows($sql);
 
     if ($num_rows > 0) {
@@ -331,14 +329,14 @@ if (isset($_POST['export_credentials_csv'])) {
         $f = fopen('php://memory', 'w');
 
         //set column headers
-        $fields = array('Name', 'Description', 'Username', 'Password', 'URI');
+        $fields = array('Name', 'Description', 'Username', 'Password', 'TOTP', 'URI');
         fputcsv($f, $fields, $delimiter, $enclosure, $escape);
 
         //output each row of the data, format line as csv and write to file pointer
         while($row = mysqli_fetch_assoc($sql)){
             $credential_username = decryptCredentialEntry($row['credential_username']);
             $credential_password = decryptCredentialEntry($row['credential_password']);
-            $lineData = array($row['credential_name'], $row['credential_description'], $credential_username, $credential_password, $row['credential_uri']);
+            $lineData = array($row['credential_name'], $row['credential_description'], $credential_username, $credential_password, $row['credential_otp_secret'], $row['credential_uri']);
             fputcsv($f, $lineData, $delimiter, $enclosure, $escape);
         }
 
@@ -390,7 +388,7 @@ if (isset($_POST["import_credentials_csv"])) {
     //(Else)Check column count
     $f = fopen($file_name, "r");
     $f_columns = fgetcsv($f, 1000, ",");
-    if (!$error & count($f_columns) != 5) {
+    if (!$error & count($f_columns) != 6) {
         $error = true;
         flash_alert("Bad column count.", 'error');
     }
@@ -403,31 +401,40 @@ if (isset($_POST["import_credentials_csv"])) {
         $duplicate_count = 0;
         while(($column = fgetcsv($file, 1000, ",")) !== false){
             $duplicate_detect = 0;
+            // Name
             if (isset($column[0])) {
                 $name = sanitizeInput($column[0]);
                 if (mysqli_num_rows(mysqli_query($mysqli,"SELECT * FROM credentials WHERE credential_name = '$name' AND credential_client_id = $client_id")) > 0){
                     $duplicate_detect = 1;
                 }
             }
+            // Desc
             if (isset($column[1])) {
                 $description = sanitizeInput($column[1]);
             }
+            // User
             if (isset($column[2])) {
                 $username = sanitizeInput(encryptCredentialEntry($column[2]));
             }
+            // Pass
             if (isset($column[3])) {
                 $password = sanitizeInput(encryptCredentialEntry($column[3]));
             }
+            // OTP
             if (isset($column[4])) {
-                $uri = sanitizeInput($column[4]);
+                $totp = sanitizeInput($column[4]);
+            }
+            // URL
+            if (isset($column[4])) {
+                $uri = sanitizeInput($column[5]);
             }
 
             // Check if duplicate was detected
             if ($duplicate_detect == 0){
                 //Add
-                mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_username = '$username', credential_password = '$password', credential_client_id = $client_id");
+                mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$totp', credential_client_id = $client_id");
                 $row_count = $row_count + 1;
-            }else{
+            } else {
                 $duplicate_count = $duplicate_count + 1;
             }
         }
@@ -455,7 +462,7 @@ if (isset($_GET['download_credentials_csv_template'])) {
     $f = fopen('php://memory', 'w');
 
     //set column headers
-    $fields = array('Name', 'Description', 'Username', 'Password', 'URI');
+    $fields = array('Name', 'Description', 'Username', 'Password', 'TOTP', 'URI');
     fputcsv($f, $fields, $delimiter);
 
     //move back to beginning of file

agent/post/document.php

@@ -633,7 +633,15 @@ if (isset($_GET['delete_document'])) {
 
     flash_alert("Document <strong>$document_name</strong> deleted and all versions", 'error');
 
-    redirect();
+    // Determine redirect behavior
+    // If there's a "from" parameter, we can use it to decide where to go
+    if (isset($_GET['from']) && $_GET['from'] === 'document_details') {
+        // User deleted from document_details.php
+        redirect("documents.php?client_id=$client_id");
+    } else {
+        // Default behavior — redirect back to previous page
+        redirect();
+    }
 
 }
 

agent/post/expense.php

@@ -336,83 +336,3 @@ if (isset($_POST['export_expenses_csv'])) {
     exit;
 
 }
-
-if (isset($_POST['create_recurring_expense'])) {
-
-    $frequency = intval($_POST['frequency']);
-    $day = intval($_POST['day']);
-    $month = intval($_POST['month']);
-    $amount =  floatval(str_replace(',', '', $_POST['amount']));
-    $account = intval($_POST['account']);
-    $vendor = intval($_POST['vendor']);
-    $client_id = intval($_POST['client']);
-    $category = intval($_POST['category']);
-    $description = sanitizeInput($_POST['description']);
-    $reference = sanitizeInput($_POST['reference']);
-
-    $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");
-
-    $recurring_expense_id = mysqli_insert_id($mysqli);
-
-    logAction("Recurring Expense", "Create", "$session_name created recurring expense $description", $client_id, $recurring_expense_id);
-
-    flash_alert("Recurring Expense created");
-
-    redirect();
-
-}
-
-if (isset($_POST['edit_recurring_expense'])) {
-
-    $recurring_expense_id = intval($_POST['recurring_expense_id']);
-    $frequency = intval($_POST['frequency']);
-    $day = intval($_POST['day']);
-    $month = intval($_POST['month']);
-    $amount =  floatval(str_replace(',', '', $_POST['amount']));
-    $account = intval($_POST['account']);
-    $vendor = intval($_POST['vendor']);
-    $client_id = intval($_POST['client']);
-    $category = intval($_POST['category']);
-    $description = sanitizeInput($_POST['description']);
-    $reference = sanitizeInput($_POST['reference']);
-
-    $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");
-
-    logAction("Recurring Expense", "Edit", "$session_name edited recurring expense $description", $client_id, $recurring_expense_id);
-
-    flash_alert("Recurring Expense edited");
-
-    redirect();
-
-}
-
-if (isset($_GET['delete_recurring_expense'])) {
-    $recurring_expense_id = intval($_GET['delete_recurring_expense']);
-
-    // Get Recurring Expense Details for Logging
-    $sql = mysqli_query($mysqli,"SELECT recurring_expense_description, recurring_expense_client_id FROM recurring_expenses WHERE recurring_expense_id = $recurring_expense_id");
-    $row = mysqli_fetch_array($sql);
-    $recurring_expense_description = sanitizeInput($row['recurring_expense_description']);
-    $client_id = intval($row['recurring_expense_client_id']);
-
-    mysqli_query($mysqli,"DELETE FROM recurring_expenses WHERE recurring_expense_id = $recurring_expense_id");
-
-    logAction("Recurring Expense", "Delete", "$session_name deleted recurring expense $recurring_expense_description", $client_id);
-
-    flash_alert("Recurring Expense deleted", 'error');
-
-    redirect();
-
-}

agent/post/payment.php

@@ -0,0 +1,901 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for credits & payments
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['add_payment'])) {
+    
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $balance = floatval($_POST['balance']);
+    $date = sanitizeInput($_POST['date']);
+    $amount = floatval($_POST['amount']);
+    $account = intval($_POST['account']);
+    $currency_code = sanitizeInput($_POST['currency_code']);
+    $payment_method = sanitizeInput($_POST['payment_method']);
+    $reference = sanitizeInput($_POST['reference']);
+    $email_receipt = intval($_POST['email_receipt']);
+
+    //Check to see if amount entered is greater than the balance of the invoice
+    if ($amount > $balance) {
+        flash_alert("Payment can not be more than the balance", 'error');
+        redirect();
+    } else {
+        mysqli_query($mysqli,"INSERT INTO payments SET payment_date = '$date', payment_amount = $amount, payment_currency_code = '$currency_code', payment_account_id = $account, payment_method = '$payment_method', payment_reference = '$reference', payment_invoice_id = $invoice_id");
+
+        // Get Payment ID for reference
+        $payment_id = mysqli_insert_id($mysqli);
+
+        //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,<br><br>We have received your payment in full for the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "<br>Payment Method: $payment_method<br>Payment Reference: $reference<br><br>Thank you for your business!<br><br><br>--<br>$company_name - Billing Department<br>$config_invoice_from_email<br>$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,<br><br>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 <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "<br>Payment Method: $payment_method<br>Payment Reference: $reference<br>Invoice Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>~<br>$company_name - Billing<br>$config_invoice_from_email<br>$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 = 'Payment added', history_invoice_id = $invoice_id");
+
+        logAction("Invoice", "Payment", "Payment amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id);
+
+        customAction('invoice_pay', $invoice_id);
+
+        flash_alert("Payment amount <strong>" . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "</strong> added");
+
+        redirect();
+
+    }
+
+}
+
+/*
+Apply Credit Not ready for use 2025-08-27 - JQ
+
+if (isset($_POST['apply_credit'])) {
+    
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $credit_amount_applied = floatval($_POST['credit_amount_applied']);
+
+    $sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id");
+    $row = mysqli_fetch_array($sql);
+    
+    $invoice_prefix = sanitizeInput($row['invoice_prefix']);
+    $invoice_number = intval($row['invoice_number']);
+    $invoice_status = sanitizeInput($row['invoice_status']);
+    $invoice_credit_amount = floatval($row['invoice_credit_amount']);
+    $invoice_amount = floatval('invoice_amount');
+    $client_id = intval($row['invoice_client_id']);
+
+    // 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 Invoice Balance
+    $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']);
+
+    $invoice_balance = $invoice_amount - $amount_paid;
+
+    // Get Credit Tally applied to invoice
+    $sql_credit_tally = mysqli_query($mysqli, "SELECT SUM(credit_tally) AS credit_balance FROM credits WHERE credit_invoice_id = $invoice_id");
+    $row = mysqli_fetch_array($sql_credit_tally);
+
+    $credit_tally = floatval($row['credit_tally']);
+
+    // Check to see if amount entered is greater than the balance of the invoice
+    if ($credit_amount_applied > $invoice_balance) {
+        flash_alert("Credit can not be more than the balance", 'alert');
+        redirect();
+    }
+
+    // Check to see if amount entered is greater than the credit balance
+    if ($credit_amount_applied > $credit_balance) {
+        flash_alert("Credit can not be more than the available credit", 'alert');
+        redirect();
+    }
+
+    // Insert a new credit usage record linked to the invoice
+    mysqli_query($mysqli, "
+        INSERT INTO credits SET
+            credit_amount = -$amount,
+            credit_type = 'usage',
+            credit_created_by = $session_user_id,
+            credit_client_id = $client_id,
+            credit_invoice_id = $invoice_id
+    ");
+
+    $new_invoice_amount = $invoice_amount - $credit_amount_applied;
+
+    // Calculate updated invoice credit sum
+    $result = mysqli_query($mysqli, "
+        SELECT SUM(credit_amount) AS credit_total
+        FROM credits
+        WHERE credit_invoice_id = $invoice_id
+    ");
+    $total_credit_applied = floatval(mysqli_fetch_assoc($result)['credit_total']);
+
+    // Get invoice amount
+    $invoice_amount = floatval(getFieldByID('invoices', $invoice_id, 'invoice_amount'));
+
+    // Determine new status
+    $invoice_due = $invoice_amount + $total_credit_applied;
+    $invoice_status = ($invoice_due <= 0) ? 'Paid' : 'Partial';
+
+    // Update the invoice credit amount
+    mysqli_query($mysqli, "
+        UPDATE invoices 
+        SET invoice_credit_amount = $total_credit_applied 
+        WHERE invoice_id = $invoice_id
+    ");
+
+    // Update invoice status only (not invoice_credit_amount)
+    mysqli_query($mysqli, "UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id");
+
+    // Log credit application in history
+    mysqli_query($mysqli, "
+        INSERT INTO history SET
+            history_status = '$invoice_status',
+            history_description = 'Credit applied',
+            history_invoice_id = $invoice_id
+    ");
+
+    logAction("Invoice", "Payment", "Credit " . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " applied to invoice $invoice_prefix$invoice_number", $client_id, $invoice_id);
+
+    customAction('invoice_pay', $invoice_id);
+
+    flash_alert("Credit amount <strong>" . numfmt_format_currency($currency_format, $amount, $session_company_currency) . "</strong> applied");
+
+    redirect();
+
+}
+
+*/
+
+if (isset($_POST['add_payment_stripe'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $saved_payment_id = intval($_POST['saved_payment_id']);
+
+    // Get invoice details
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices
+            LEFT JOIN clients ON invoice_client_id = client_id
+            LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
+            WHERE invoice_id = $invoice_id"
+    );
+    $row = mysqli_fetch_array($sql);
+    $invoice_number = intval($row['invoice_number']);
+    $invoice_status = sanitizeInput($row['invoice_status']);
+    $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']));
+
+    // Get ITFlow company details
+    $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']);
+
+    // 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);
+
+    // Get Client Payment Details
+    $sql = mysqli_query($mysqli, "SELECT * FROM client_saved_payment_methods LEFT JOIN payment_providers ON saved_payment_provider_id = payment_provider_id LEFT JOIN client_payment_provider ON saved_payment_client_id = client_id WHERE saved_payment_id = $saved_payment_id LIMIT 1");
+    $row = mysqli_fetch_array($sql);
+
+    $public_key = sanitizeInput($row['payment_provider_public_key']);
+    $private_key = sanitizeInput($row['payment_provider_private_key']);
+    $account_id = intval($row['payment_provider_account']);
+    $expense_category_id = intval($row['payment_provider_expense_category']);
+    $expense_vendor_id = intval($row['payment_provider_expense_vendor']);
+    $expense_percentage_fee = floatval($row['payment_provider_expense_percentage_fee']);
+    $expense_flat_fee = floatval($row['payment_provider_expense_flat_fee']);
+    $payment_provider_client = sanitizeInput($row['payment_provider_client']);
+    $saved_payment_method = sanitizeInput($row['saved_payment_provider_method']);
+    $saved_payment_description = sanitizeInput($row['saved_payment_description']);
+
+    // Sanity checks
+    if (!$payment_provider_client || !$saved_payment_method) {
+        flash_alert("Stripe not enabled or no client card saved", 'error');
+        redirect();
+    } elseif ($invoice_status !== 'Sent' && $invoice_status !== 'Viewed') {
+        flash_alert("Invalid invoice state (draft/partial/paid/not billable)", 'error');
+        redirect();
+    } elseif ($invoice_amount == 0) {
+        flash_alert("Invalid invoice amount", 'error');
+        redirect();
+    }
+
+    // Initialize Stripe
+    require_once __DIR__ . '/../../plugins/stripe-php/init.php';
+    $stripe = new \Stripe\StripeClient($private_key);
+
+    $balance_to_pay = round($invoice_amount, 2);
+    $pi_description = "ITFlow: $client_name payment of $invoice_currency_code $balance_to_pay for $invoice_prefix$invoice_number";
+
+    // 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' => $invoice_currency_code,
+            'customer' => $payment_provider_client,
+            'payment_method' => $saved_payment_method,
+            '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,
+            ]
+        ]);
+
+        // 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;
+
+    } 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");
+    }
+
+    if ($payment_intent->status == "succeeded" && intval($balance_to_pay) == intval($pi_amount_paid)) {
+
+        // 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 = $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 (agent)', history_invoice_id = $invoice_id");
+
+        // Email receipt
+        if (!empty($config_smtp_host)) {
+            $subject = "Payment Received - Invoice $invoice_prefix$invoice_number";
+            $body = "Hello $contact_name,<br><br>We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>--<br>$company_name - Billing Department<br>$config_invoice_from_email<br>$company_phone";
+
+            // Queue Mail
+            $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, <br><br>This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-<br><br>--------<br><br>Hello $contact_name,<br><br>We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>--<br>$company_name - Billing Department<br>$config_invoice_from_email<br>$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,
+                ];
+            }
+
+            $mail = addToMailQueue($data);
+
+            // 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);
+        }
+
+        // Log info
+        $extended_log_desc = '';
+        if (!$pi_livemode) {
+            $extended_log_desc = '(DEV MODE)';
+        }
+
+        // Create Stripe payment gateway fee as an expense (if configured)
+        if ($expense_vendor_id > 0 && $expense_category_id > 0) {
+            $gateway_fee = round($invoice_amount * $expense_percentage_fee + $expense_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 = $account_id, expense_vendor_id = $expense_vendor_id, expense_client_id = $client_id, expense_category_id = $expense_category_id, 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", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
+        logAction("Invoice", "Payment", "$session_name initiated Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id);
+        customAction('invoice_pay', $invoice_id);
+
+        flash_alert("Payment amount <strong>" . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "</strong> added");
+        
+        redirect();
+
+    } else {
+        mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe pay failed due to payment error', history_invoice_id = $invoice_id");
+        
+        logAction("Invoice", "Payment", "Failed online payment amount of invoice $invoice_prefix$invoice_number due to Stripe payment error", $client_id, $invoice_id);
+        flash_alert("Payment failed", 'error');
+        
+        redirect();
+    }
+
+}
+
+/*
+if (isset($_GET['add_payment_stripe'])) {
+
+    validateCSRFToken($_GET['csrf_token']);
+
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $invoice_id = intval($_GET['invoice_id']);
+
+    // Get invoice details
+    $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_number = intval($row['invoice_number']);
+    $invoice_status = sanitizeInput($row['invoice_status']);
+    $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']));
+
+    // Get ITFlow company details
+    $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']);
+
+    // 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);
+
+    // Get Client Stripe details
+    $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']);
+
+    // Sanity checks
+    if (!$config_stripe_enable || !$stripe_id || !$stripe_pm) {
+        flash_alert("Stripe not enabled or no client card saved", 'error');
+        redirect();
+    } elseif ($invoice_status !== 'Sent' && $invoice_status !== 'Viewed') {
+        flash_alert("Invalid invoice state (draft/partial/paid/not billable)", 'error');
+        redirect();
+    } elseif ($invoice_amount == 0) {
+        flash_alert("Invalid invoice amount", 'error');
+        redirect();
+    }
+
+    // Initialize Stripe
+    require_once __DIR__ . '/../plugins/stripe-php/init.php';
+    $stripe = new \Stripe\StripeClient($config_stripe_secret);
+
+    $balance_to_pay = round($invoice_amount, 2);
+    $pi_description = "ITFlow: $client_name payment of $invoice_currency_code $balance_to_pay for $invoice_prefix$invoice_number";
+
+    // 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' => $invoice_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,
+            ]
+        ]);
+
+        // 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;
+
+    } 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");
+    }
+
+    if ($payment_intent->status == "succeeded" && intval($balance_to_pay) == intval($pi_amount_paid)) {
+
+        // 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 history SET history_status = 'Paid', history_description = 'Online Payment added (agent)', history_invoice_id = $invoice_id");
+
+        // Email receipt
+        if (!empty($config_smtp_host)) {
+            $subject = "Payment Received - Invoice $invoice_prefix$invoice_number";
+            $body = "Hello $contact_name,<br><br>We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>--<br>$company_name - Billing Department<br>$config_invoice_from_email<br>$company_phone";
+
+            // Queue Mail
+            $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, <br><br>This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-<br><br>--------<br><br>Hello $contact_name,<br><br>We have received online payment for the amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " for invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount Paid: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>--<br>$company_name - Billing Department<br>$config_invoice_from_email<br>$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,
+                ];
+            }
+
+            $mail = addToMailQueue($data);
+
+            // 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);
+        }
+
+        // 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 = '$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 $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", "$session_name initiated Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id);
+        customAction('invoice_pay', $invoice_id);
+
+        flash_alert("Payment amount <strong>" . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "</strong> added");
+        
+        redirect();
+
+    } else {
+        mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Payment failed', history_description = 'Stripe pay failed due to payment error', history_invoice_id = $invoice_id");
+        
+        logAction("Invoice", "Payment", "Failed online payment amount of invoice $invoice_prefix$invoice_number due to Stripe payment error", $client_id, $invoice_id);
+        flash_alert("Payment failed", 'error');
+        
+        redirect();
+    }
+
+}
+*/
+
+if (isset($_POST['add_bulk_payment'])) {
+    
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $client_id = intval($_POST['client_id']);
+    $date = sanitizeInput($_POST['date']);
+    $bulk_payment_amount = floatval($_POST['amount']);
+    $bulk_payment_amount_static = floatval($_POST['amount']);
+    $total_account_balance = floatval($_POST['balance']);
+    $account = intval($_POST['account']);
+    $currency_code = sanitizeInput($_POST['currency_code']);
+    $payment_method = sanitizeInput($_POST['payment_method']);
+    $reference = sanitizeInput($_POST['reference']);
+    $email_receipt = intval($_POST['email_receipt']);
+
+    // Check if bulk_payment_amount exceeds total_account_balance
+    if ($bulk_payment_amount > $total_account_balance) {
+        flash_alert("Payment exceeds Client Balance.", 'error');
+        redirect();
+    }
+
+    // Get Invoices
+    $sql_invoices = "SELECT * FROM invoices
+        WHERE invoice_status != 'Draft'
+        AND invoice_status != 'Paid'
+        AND invoice_status != 'Cancelled'
+        AND invoice_client_id = $client_id
+        ORDER BY invoice_number ASC";
+    $result_invoices = mysqli_query($mysqli, $sql_invoices);
+
+    // Loop Through Each Invoice
+    while ($row = mysqli_fetch_array($result_invoices)) {
+        $invoice_id = intval($row['invoice_id']);
+        $invoice_prefix = sanitizeInput($row['invoice_prefix']);
+        $invoice_number = intval($row['invoice_number']);
+        $invoice_amount = floatval($row['invoice_amount']);
+        $invoice_url_key = sanitizeInput($row['invoice_url_key']);
+        $invoice_balance_query = "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id";
+        $result_amount_paid = mysqli_query($mysqli, $invoice_balance_query);
+        $row_amount_paid = mysqli_fetch_array($result_amount_paid);
+        $amount_paid = floatval($row_amount_paid['amount_paid']);
+        $invoice_balance = $invoice_amount - $amount_paid;
+
+        if ($bulk_payment_amount <= 0) {
+            break; // Exit the loop if no payment amount is left
+        }
+
+        if ($bulk_payment_amount >= $invoice_balance) {
+            $payment_amount = $invoice_balance;
+            $invoice_status = "Paid";
+        } else {
+            $payment_amount = $bulk_payment_amount;
+            $invoice_status = "Partial";
+        }
+
+        // Subtract the payment amount from the bulk payment amount
+        $bulk_payment_amount -= $payment_amount;
+
+        // Get Invoice Remain Balance
+        $remaining_invoice_balance = $invoice_balance - $payment_amount;
+
+        // Add Payment
+        $payment_query = "INSERT INTO payments (payment_date, payment_amount, payment_currency_code, payment_account_id, payment_method, payment_reference, payment_invoice_id) VALUES ('{$date}', {$payment_amount}, '{$currency_code}', {$account}, '{$payment_method}', '{$reference}', {$invoice_id})";
+        mysqli_query($mysqli, $payment_query);
+        $payment_id = mysqli_insert_id($mysqli);
+
+        // Update Invoice Status
+        $update_invoice_query = "UPDATE invoices SET invoice_status = '{$invoice_status}' WHERE invoice_id = {$invoice_id}";
+        mysqli_query($mysqli, $update_invoice_query);
+
+        // Add Payment to History
+        $history_description = "Payment added";
+        $add_history_query = "INSERT INTO history (history_status, history_description, history_invoice_id) VALUES ('{$invoice_status}', '{$history_description}', {$invoice_id})";
+        mysqli_query($mysqli, $add_history_query);
+
+        // Add to Email Body Invoice Portion
+        $email_body_invoices .= "<br>Invoice <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>$invoice_prefix$invoice_number</a> - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code);
+
+        customAction('invoice_pay', $invoice_id);
+
+    } // End Invoice Loop
+
+    // Send Email
+    if ($email_receipt == 1) {
+
+        // Get Client / Contact Info
+        $sql_client = mysqli_query($mysqli,"SELECT * FROM clients
+            LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id 
+            AND contact_primary = 1
+            WHERE client_id = $client_id"
+        );
+
+        $row = mysqli_fetch_array($sql_client);
+        $client_name = sanitizeInput($row['client_name']);
+        $contact_name = sanitizeInput($row['contact_name']);
+        $contact_email = sanitizeInput($row['contact_email']);
+
+        $sql_company = mysqli_query($mysqli,"SELECT company_name, company_phone, company_phone_country_code 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'], $row['company_phone_country_code']));
+
+        // 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);
+
+        $subject = "Payment Received - Multiple Invoices";
+        $body = "Hello $contact_name,<br><br>Thank you for your payment of " . numfmt_format_currency($currency_format, $bulk_payment_amount_static, $currency_code) . " We\'ve applied your payment to the following invoices, updating their balances accordingly:<br><br>$email_body_invoices<br><br><br>We appreciate your continued business!<br><br>Sincerely,<br>$company_name - Billing<br>$config_invoice_from_email<br>$company_phone";
+
+        // Queue Mail
+        mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email', email_recipient_name = '$contact_name', email_from = '$config_invoice_from_email', email_from_name = '$config_invoice_from_name', email_subject = '$subject', email_content = '$body'");
+
+        // Get Email ID for reference
+        $email_id = mysqli_insert_id($mysqli);
+
+        // Email Logging
+        logAction("Payment", "Email", "Bulk Payment receipt for multiple Invoices queued to $contact_email Email ID: $email_id", $client_id);
+
+        $alert_message .= "Email receipt queued and ";
+
+    } // End Email
+
+    logAction("Invoice", "Payment", "Bulk Payment amount of " . numfmt_format_currency($currency_format, $bulk_payment_amount_static, $currency_code) . " applied to multiple invoices", $client_id);
+
+    flash_alert("$alert_message Bulk Payment added");
+
+    redirect();
+
+}
+
+if (isset($_GET['delete_payment'])) {
+    
+    enforceUserPermission('module_sales', 2);
+    enforceUserPermission('module_financial', 2);
+
+    $payment_id = intval($_GET['delete_payment']);
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM payments WHERE payment_id = $payment_id");
+    $row = mysqli_fetch_array($sql);
+    $invoice_id = intval($row['payment_invoice_id']);
+    $deleted_payment_amount = floatval($row['payment_amount']);
+
+    //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 total_payments_amount FROM payments WHERE payment_invoice_id = $invoice_id");
+    $row = mysqli_fetch_array($sql_total_payments_amount);
+    $total_payments_amount = floatval($row['total_payments_amount']);
+
+    // Get the invoice total and details
+    $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']);
+    $client_id = intval($row['invoice_client_id']);
+    $invoice_amount = floatval($row['invoice_amount']);
+
+    //Calculate the Invoice balance
+    $invoice_balance = $invoice_amount - $total_payments_amount + $deleted_payment_amount;
+
+    //Determine if invoice has been paid
+    if ($invoice_balance == 0) {
+        $invoice_status = "Paid";
+    } else {
+        $invoice_status = "Partial";
+    }
+
+    //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 = 'Payment deleted', history_invoice_id = $invoice_id");
+
+    mysqli_query($mysqli,"DELETE FROM payments WHERE payment_id = $payment_id");
+
+    logAction("Invoice", "Edit", "$session_name deleted Payment on Invoice $invoice_prefix$invoice_number", $client_id, $invoice_id);
+
+    flash_alert("Payment deleted", 'error');
+    if ($config_stripe_enable) {
+       flash_alert("Payment deleted - Stripe payments must be manually refunded in Stripe", 'error');
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['export_payments_csv'])) {
+    
+    if (isset($_POST['client_id'])) {
+        $client_id = intval($_POST['client_id']);
+        $client_query = "AND invoice_client_id = $client_id";
+        $client_name = getFieldById('clients', $client_id, 'client_name');
+        $file_name_prepend = "$client_name-";
+    } else {
+        $client_query = '';
+        $client_name = '';
+        $file_name_prepend = "$session_company_name-";
+    }
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM payments, invoices WHERE payment_invoice_id = invoice_id $client_query ORDER BY payment_date ASC");
+    
+    $num_rows = mysqli_num_rows($sql);
+
+    if ($num_rows > 0) {
+        $delimiter = ",";
+        $enclosure = '"';
+        $escape    = '\\';   // backslash
+        $filename = sanitize_filename($file_name_prepend . "Payments-" . date('Y-m-d_H-i-s') . ".csv");
+
+        //create a file pointer
+        $f = fopen('php://memory', 'w');
+
+        //set column headers
+        $fields = array('Payment Date', 'Invoice Date', 'Invoice Number', 'Invoice Amount', 'Payment Amount', 'Payment Method', 'Referrence');
+        fputcsv($f, $fields, $delimiter, $enclosure, $escape);
+
+        //output each row of the data, format line as csv and write to file pointer
+        while($row = $sql->fetch_assoc()){
+            $lineData = array($row['payment_date'], $row['invoice_date'], $row['invoice_prefix'] . $row['invoice_number'], $row['invoice_amount'], $row['payment_amount'], $row['payment_method'], $row['payment_reference']);
+            fputcsv($f, $lineData, $delimiter, $enclosure, $escape);
+        }
+
+        //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);
+    }
+
+    logAction("Payments", "Export", "$session_name exported $num_rows payments to CSV file");
+
+    exit;
+
+}

agent/post/recurring_expense.php

@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for recurring expenses
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['create_recurring_expense'])) {
+
+    $frequency = intval($_POST['frequency']);
+    $day = intval($_POST['day']);
+    $month = intval($_POST['month']);
+    $amount =  floatval(str_replace(',', '', $_POST['amount']));
+    $account = intval($_POST['account']);
+    $vendor = intval($_POST['vendor']);
+    $client_id = intval($_POST['client']);
+    $category = intval($_POST['category']);
+    $description = sanitizeInput($_POST['description']);
+    $reference = sanitizeInput($_POST['reference']);
+
+    $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");
+
+    $recurring_expense_id = mysqli_insert_id($mysqli);
+
+    logAction("Recurring Expense", "Create", "$session_name created recurring expense $description", $client_id, $recurring_expense_id);
+
+    flash_alert("Recurring Expense created");
+
+    redirect();
+
+}
+
+if (isset($_POST['edit_recurring_expense'])) {
+
+    $recurring_expense_id = intval($_POST['recurring_expense_id']);
+    $frequency = intval($_POST['frequency']);
+    $day = intval($_POST['day']);
+    $month = intval($_POST['month']);
+    $amount =  floatval(str_replace(',', '', $_POST['amount']));
+    $account = intval($_POST['account']);
+    $vendor = intval($_POST['vendor']);
+    $client_id = intval($_POST['client']);
+    $category = intval($_POST['category']);
+    $description = sanitizeInput($_POST['description']);
+    $reference = sanitizeInput($_POST['reference']);
+
+    $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");
+
+    logAction("Recurring Expense", "Edit", "$session_name edited recurring expense $description", $client_id, $recurring_expense_id);
+
+    flash_alert("Recurring Expense edited");
+
+    redirect();
+
+}
+
+if (isset($_GET['delete_recurring_expense'])) {
+    $recurring_expense_id = intval($_GET['delete_recurring_expense']);
+
+    // Get Recurring Expense Details for Logging
+    $sql = mysqli_query($mysqli,"SELECT recurring_expense_description, recurring_expense_client_id FROM recurring_expenses WHERE recurring_expense_id = $recurring_expense_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_expense_description = sanitizeInput($row['recurring_expense_description']);
+    $client_id = intval($row['recurring_expense_client_id']);
+
+    mysqli_query($mysqli,"DELETE FROM recurring_expenses WHERE recurring_expense_id = $recurring_expense_id");
+
+    logAction("Recurring Expense", "Delete", "$session_name deleted recurring expense $recurring_expense_description", $client_id);
+
+    flash_alert("Recurring Expense deleted", 'error');
+
+    redirect();
+
+}

agent/post/recurring_invoice.php

@@ -0,0 +1,548 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for recurring invoices
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['add_invoice_recurring'])) {
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $recurring_invoice_frequency = sanitizeInput($_POST['frequency']);
+
+    $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_date = sanitizeInput($row['invoice_date']);
+    $invoice_amount = floatval($row['invoice_amount']);
+    $invoice_currency_code = sanitizeInput($row['invoice_currency_code']);
+    $invoice_scope = sanitizeInput($row['invoice_scope']);
+    $invoice_note = sanitizeInput($row['invoice_note']);
+    $client_id = intval($row['invoice_client_id']);
+    $category_id = intval($row['invoice_category_id']);
+
+    //Get the last Recurring Invoice Number and add 1 for the new Recurring Invoice number
+    $recurring_invoice_number = $config_recurring_invoice_next_number;
+    $new_config_recurring_invoice_next_number = $config_recurring_invoice_next_number + 1;
+    mysqli_query($mysqli,"UPDATE settings SET config_recurring_invoice_next_number = $new_config_recurring_invoice_next_number WHERE company_id = 1");
+
+    mysqli_query($mysqli,"INSERT INTO recurring_invoices SET recurring_invoice_prefix = '$config_recurring_invoice_prefix', recurring_invoice_number = $recurring_invoice_number, recurring_invoice_scope = '$invoice_scope', recurring_invoice_frequency = '$recurring_invoice_frequency', recurring_invoice_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_invoice_frequency), recurring_invoice_status = 1, recurring_invoice_amount = $invoice_amount, recurring_invoice_currency_code = '$invoice_currency_code', recurring_invoice_note = '$invoice_note', recurring_invoice_category_id = $category_id, recurring_invoice_client_id = $client_id");
+
+    $recurring_invoice_id = mysqli_insert_id($mysqli);
+
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Recurring Invoice Created from INVOICE!', history_recurring_invoice_id = $recurring_invoice_id");
+
+    $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id");
+    while($row = mysqli_fetch_array($sql_items)) {
+        $item_id = intval($row['item_id']);
+        $item_name = sanitizeInput($row['item_name']);
+        $item_description = sanitizeInput($row['item_description']);
+        $item_quantity = floatval($row['item_quantity']);
+        $item_price = floatval($row['item_price']);
+        $item_subtotal = floatval($row['item_subtotal']);
+        $item_tax = floatval($row['item_tax']);
+        $item_total = floatval($row['item_total']);
+        $item_order = intval($row['item_order']);
+        $tax_id = intval($row['item_tax_id']);
+
+        mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax, item_total = $item_total, item_order = $item_order, item_tax_id = $tax_id, item_recurring_invoice_id = $recurring_invoice_id");
+    }
+
+    logAction("Recurring Invoice", "Create", "$session_name created recurring Invoice from Invoice $invoice_prefix$invoice_number", $client_id, $recurring_invoice_id);
+
+    flash_alert("Created recurring Invoice from Invoice <strong>$invoice_prefix$invoice_number</strong>");
+
+    redirect("recurring_invoice.php?recurring_invoice_id=$recurring_invoice_id");
+
+}
+
+if (isset($_POST['add_recurring_invoice'])) {
+
+    $client_id = intval($_POST['client']);
+    $frequency = sanitizeInput($_POST['frequency']);
+    $start_date = sanitizeInput($_POST['start_date']);
+    $category = intval($_POST['category']);
+    $scope = sanitizeInput($_POST['scope']);
+
+    //Get the last Recurring Number and add 1 for the new Recurring number
+    $recurring_invoice_number = $config_recurring_invoice_next_number;
+    $new_config_recurring_invoice_next_number = $config_recurring_invoice_next_number + 1;
+    mysqli_query($mysqli,"UPDATE settings SET config_recurring_invoice_next_number = $new_config_recurring_invoice_next_number WHERE company_id = 1");
+
+    mysqli_query($mysqli,"INSERT INTO recurring_invoices SET recurring_invoice_prefix = '$config_recurring_invoice_prefix', recurring_invoice_number = $recurring_invoice_number, recurring_invoice_scope = '$scope', recurring_invoice_frequency = '$frequency', recurring_invoice_next_date = '$start_date', recurring_invoice_category_id = $category, recurring_invoice_status = 1, recurring_invoice_currency_code = '$session_company_currency', recurring_invoice_client_id = $client_id");
+
+    $recurring_invoice_id = mysqli_insert_id($mysqli);
+
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Active', history_description = 'Recurring Invoice created', history_recurring_invoice_id = $recurring_invoice_id");
+
+    logAction("Recurring Invoice", "Create", "$session_name created recurring invoice $config_recurring_invoice_prefix$recurring_invoice_number - $scope", $client_id, $recurring_invoice_id);
+
+    flash_alert("Recurring Invoice <strong>$config_recurring_invoice_prefix$recurring_invoice_number</strong> created");
+
+    redirect("recurring_invoice.php?recurring_invoice_id=$recurring_invoice_id");
+
+}
+
+if (isset($_POST['edit_recurring_invoice'])) {
+
+    $recurring_invoice_id = intval($_POST['recurring_invoice_id']);
+    $frequency = sanitizeInput($_POST['frequency']);
+    $next_date = sanitizeInput($_POST['next_date']);
+    $category = intval($_POST['category']);
+    $scope = sanitizeInput($_POST['scope']);
+    $status = intval($_POST['status']);
+    $recurring_invoice_discount = floatval($_POST['recurring_invoice_discount']);
+
+    // Get Recurring Invoice Details and Client ID for Logging
+    $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id 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']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+
+    //Calculate new total
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
+    $recurring_invoice_amount = 0;
+    while($row = mysqli_fetch_array($sql)) {
+        $item_total = floatval($row['item_total']);
+        $recurring_invoice_amount = $recurring_invoice_amount + $item_total;
+    }
+    $recurring_invoice_amount = $recurring_invoice_amount - $recurring_invoice_discount;
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_scope = '$scope', recurring_invoice_frequency = '$frequency', recurring_invoice_next_date = '$next_date', recurring_invoice_category_id = $category, recurring_invoice_discount_amount = $recurring_invoice_discount, recurring_invoice_amount = $recurring_invoice_amount, recurring_invoice_status = $status WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = '$status', history_description = 'Recurring Invoice edited', history_recurring_invoice_id = $recurring_invoice_id");
+
+    logAction("Recurring Invoice", "Edit", "$session_name edited recurring invoice $recurring_invoice_prefix$recurring_invoice_number - $scope", $client_id, $recurring_invoice_id);
+
+    flash_alert("Recurring Invoice <strong>$recurring_invoice_prefix$recurring_invoice_number</strong> edited");
+
+    redirect();
+
+}
+
+if (isset($_GET['delete_recurring_invoice'])) {
+    
+    $recurring_invoice_id = intval($_GET['delete_recurring_invoice']);
+
+    // Get Recurring Invoice Details and Client ID for Logging
+    $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_scope, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
+    $recurring_invoice_number = intval($row['recurring_invoice_number']);
+    $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+
+    mysqli_query($mysqli,"DELETE FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    //Delete Items Associated with the Recurring
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
+    while($row = mysqli_fetch_array($sql)) {
+        $item_id = intval($row['item_id']);
+        mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id");
+    }
+
+    //Delete History Associated with the Invoice
+    $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_recurring_invoice_id = $recurring_invoice_id");
+    while($row = mysqli_fetch_array($sql)) {
+        $history_id = intval($row['history_id']);
+        mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id");
+    }
+
+    logAction("Recurring Invoice", "Delete", "$session_name deleted recurring invoice $recurring_invoice_prefix$recurring_invoice_number - $recurring_invoice_scope", $client_id);
+
+    flash_alert("Recurring Invoice <strong>$recurring_invoice_prefix$recurring_invoice_number</strong> deleted", 'error');
+
+    redirect();
+
+}
+
+if (isset($_POST['add_recurring_invoice_item'])) {
+
+    $recurring_invoice_id = intval($_POST['recurring_invoice_id']);
+    $name = sanitizeInput($_POST['name']);
+    $description = sanitizeInput($_POST['description']);
+    $qty = floatval($_POST['qty']);
+    $price = floatval($_POST['price']);
+    $tax_id = intval($_POST['tax_id']);
+    $item_order = intval($_POST['item_order']);
+
+    $subtotal = $price * $qty;
+
+    if ($tax_id > 0) {
+        $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id");
+        $row = mysqli_fetch_array($sql);
+        $tax_percent = floatval($row['tax_percent']);
+        $tax_amount = $subtotal * $tax_percent / 100;
+    } else {
+        $tax_amount = 0;
+    }
+
+    $total = $subtotal + $tax_amount;
+
+    mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_recurring_invoice_id = $recurring_invoice_id");
+
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']);
+    $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
+    $recurring_invoice_number = intval($row['recurring_invoice_number']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+
+    //add up all the items
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
+    $recurring_invoice_amount = 0;
+    while($row = mysqli_fetch_array($sql)) {
+        $item_total = floatval($row['item_total']);
+        $recurring_invoice_amount = $recurring_invoice_amount + $item_total;
+    }
+    $recurring_invoice_amount = $recurring_invoice_amount - $recurring_invoice_discount;
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    logAction("Recurring Invoice", "Edit", "$session_name added item $name to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id);
+
+    flash_alert("Item <srrong>$name</strong> added to Recurring Invoice");
+
+    redirect();
+
+}
+
+if (isset($_POST['recurring_invoice_note'])) {
+
+    $recurring_invoice_id = intval($_POST['recurring_invoice_id']);
+    $note = sanitizeInput($_POST['note']);
+
+    // Get Recurring details for logging
+    $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id 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']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_note = '$note' WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    logAction("Recurring Invoice", "Edit", "$session_name added note to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id);
+
+    flash_alert("Notes added");
+
+    redirect();
+
+}
+
+if (isset($_GET['delete_recurring_invoice_item'])) {
+    
+    $item_id = intval($_GET['delete_recurring_invoice_item']);
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_invoice_id = intval($row['item_recurring_invoice_id']);
+    $item_name = sanitizeInput($row['item_name']);
+    $item_subtotal = floatval($row['item_subtotal']);
+    $item_tax = floatval($row['item_tax']);
+    $item_total = floatval($row['item_total']);
+
+    $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']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+    
+    $new_recurring_invoice_amount = floatval($row['recurring_invoice_amount']) - $item_total;
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id");
+
+    logAction("Recurring Invoice", "Edit", "$session_name removed item $item_name from recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id);
+
+    flash_alert("Item <strong>$item_name</strong> removed", 'error');
+
+    redirect();
+
+}
+
+if (isset($_GET['force_recurring'])) {
+    
+    $recurring_invoice_id = intval($_GET['force_recurring']);
+
+    $sql_recurring_invoices = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, clients WHERE client_id = recurring_invoice_client_id AND recurring_invoice_id = $recurring_invoice_id");
+
+    $row = mysqli_fetch_array($sql_recurring_invoices);
+    $recurring_invoice_id = intval($row['recurring_invoice_id']);
+    $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']);
+    $recurring_invoice_frequency = sanitizeInput($row['recurring_invoice_frequency']);
+    $recurring_invoice_status = sanitizeInput($row['recurring_invoice_status']);
+    $recurring_invoice_last_sent = sanitizeInput($row['recurring_invoice_last_sent']);
+    $recurring_invoice_next_date = sanitizeInput($row['recurring_invoice_next_date']);
+    $recurring_invoice_discount_amount = floatval($row['recurring_invoice_discount_amount']);
+    $recurring_invoice_amount = floatval($row['recurring_invoice_amount']);
+    $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']);
+    $recurring_invoice_note = sanitizeInput($row['recurring_invoice_note']);
+    $category_id = intval($row['recurring_invoice_category_id']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+    $client_net_terms = intval($row['client_net_terms']);
+
+    //Get the last Invoice Number and add 1 for the new invoice number
+    $new_invoice_number = $config_invoice_next_number;
+    $new_config_invoice_next_number = $config_invoice_next_number + 1;
+    mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = 1");
+
+    //Generate a unique URL key for clients to access
+    $url_key = randomString(156);
+
+    mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_invoice_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_invoice_discount_amount, invoice_amount = $recurring_invoice_amount, invoice_currency_code = '$recurring_invoice_currency_code', invoice_note = '$recurring_invoice_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_recurring_invoice_id = $recurring_invoice_id, invoice_client_id = $client_id");
+
+    $new_invoice_id = mysqli_insert_id($mysqli);
+
+    //Copy Items from original invoice to new invoice
+    $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC");
+
+    while($row = mysqli_fetch_array($sql_invoice_items)) {
+        $item_id = intval($row['item_id']);
+        $item_name = sanitizeInput($row['item_name']);
+        $item_description = sanitizeInput($row['item_description']);
+        $item_quantity = floatval($row['item_quantity']);
+        $item_price = floatval($row['item_price']);
+        $item_subtotal = floatval($row['item_subtotal']);
+        $item_order = intval($row['item_order']);
+        $tax_id = intval($row['item_tax_id']);
+
+        //Recalculate Item Tax since Tax percents can change.
+        if ($tax_id > 0) {
+            $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id");
+            $row = mysqli_fetch_array($sql);
+            $tax_percent = floatval($row['tax_percent']);
+            $item_tax_amount = $item_subtotal * $tax_percent / 100;
+        } else {
+            $item_tax_amount = 0;
+        }
+
+        $item_total = $item_subtotal + $item_tax_amount;
+
+        //Update Recurring Items with new tax
+        mysqli_query($mysqli,"UPDATE invoice_items SET item_tax = $item_tax_amount, item_total = $item_total, item_tax_id = $tax_id, item_order = $item_order WHERE item_id = $item_id");
+
+        mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax_amount, item_total = $item_total, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id");
+    }
+
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id");
+
+    //Update Recurring Balances by tallying up recurring items also update recurring dates
+    $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id");
+    $row = mysqli_fetch_array($sql_recurring_invoice_total);
+    $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount_amount;
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount, recurring_invoice_last_sent = CURDATE(), recurring_invoice_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_invoice_frequency) WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    //Also update the newly created invoice with the new amounts
+    mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = $new_recurring_invoice_amount WHERE invoice_id = $new_invoice_id");
+
+    if ($config_recurring_auto_send_invoice == 1) {
+        $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 = $new_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']);
+        $invoice_date = sanitizeInput($row['invoice_date']);
+        $invoice_due = sanitizeInput($row['invoice_due']);
+        $invoice_amount = floatval($row['invoice_amount']);
+        $invoice_url_key = sanitizeInput($row['invoice_url_key']);
+        $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 = intval($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_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
+        $company_email = sanitizeInput($row['company_email']);
+        $company_website = sanitizeInput($row['company_website']);
+
+        // Sanitize Config Vars
+        $config_invoice_from_email = sanitizeInput($config_invoice_from_email);
+        $config_invoice_from_name = sanitizeInput($config_invoice_from_name);
+
+        // Email to client
+
+        $subject = "Invoice $invoice_prefix$invoice_number";
+        $body = "Hello $contact_name,<br><br>An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: $$invoice_amount<br>Due Date: $invoice_due<br><br><br>To view your invoice, please click <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key\'>here</a>.<br><br><br>--<br>$company_name - Billing<br>$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
+            ]
+        ];
+        $mail = addToMailQueue($data);
+
+        if ($mail === true) {
+            // Add send history
+            mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Force Emailed Invoice!', history_invoice_id = $new_invoice_id");
+
+            // Update Invoice Status to Sent
+            mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent', invoice_client_id = $client_id WHERE invoice_id = $new_invoice_id");
+
+        } else {
+            // Error reporting
+            appNotify("Mail", "Failed to send email to $contact_email");
+
+            logAction("Mail", "Error", "Failed to send email to $contact_email regarding $subject. $mail");
+
+        }
+
+    } //End Recurring Invoices Loop
+
+    logAction("Invoice", "Create", "$session_name forced recurring invoice into an invoice", $client_id, $new_invoice_id);
+
+    customAction('invoice_create', $new_invoice_id);
+
+    flash_alert("Recurring Invoice Forced");
+
+    redirect();
+
+}
+
+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);
+
+        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);
+
+        flash_alert("Automatic Payment <strong>$saved_payment_description</strong> 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");
+
+        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);
+
+        flash_alert("Automatic Payment <strong>Disabled</strong> for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", 'error');
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['export_client_recurring_invoice_csv'])) {
+    
+    $client_id = intval($_POST['client_id']);
+
+    //get records from database
+    $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id");
+    $row = mysqli_fetch_array($sql);
+
+    $client_name = $row['client_name'];
+
+    $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id ORDER BY recurring_invoice_number ASC");
+    
+    $num_rows = mysqli_num_rows($sql);
+
+    if ($num_rows > 0) {
+        $delimiter = ",";
+        $filename = $client_name . "-Recurring Invoices-" . date('Y-m-d') . ".csv";
+
+        //create a file pointer
+        $f = fopen('php://memory', 'w');
+
+        //set column headers
+        $fields = array('Recurring Number', 'Scope', 'Amount', 'Frequency', 'Date Created');
+        fputcsv($f, $fields, $delimiter);
+
+        //output each row of the data, format line as csv and write to file pointer
+        while($row = $sql->fetch_assoc()) {
+            $lineData = array($row['recurring_invoice_prefix'] . $row['recurring_invoice_number'], $row['recurring_invoice_scope'], $row['recurring_invoice_amount'], ucwords($row['recurring_invoice_frequency'] . "ly"), $row['recurring_invoice_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);
+    }
+
+    logAction("Recurring Invoice", "Export", "$session_name exported $num_rows recurring invoices to CSV file");
+
+    exit;
+
+}
+
+if (isset($_GET['recurring_invoice_email_notify'])) {
+    
+    $recurring_invoice_email_notify = intval($_GET['recurring_invoice_email_notify']);
+    $recurring_invoice_id = intval($_GET['recurring_invoice_id']);
+
+    $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']);
+    $client_id = intval($row['recurring_invoice_client_id']);
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_email_notify = $recurring_invoice_email_notify WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    // Wording
+    if ($recurring_invoice_email_notify) {
+        $notify_wording = "On";
+    } else { 
+        $notify_wording = "Off";
+    }
+
+    logAction("Recurring Invoice", "Edit", "$session_name turned $notify_wording Email Notifications for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id);
+
+    flash_alert("Email Notifications <strong>$notify_wording</strong>", 'error');
+
+    redirect();
+
+}

agent/post/recurring_ticket.php

@@ -0,0 +1,636 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for recurring tickets
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['add_recurring_ticket'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    require_once 'ticket_recurring_model.php';
+
+    $start_date = sanitizeInput($_POST['start_date']);
+
+    mysqli_query($mysqli, "INSERT INTO recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_start_date = '$start_date', recurring_ticket_next_run = '$start_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_created_by = $session_user_id, recurring_ticket_client_id = $client_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_asset_id = $asset_id, recurring_ticket_category = $category");
+
+    $recurring_ticket_id = mysqli_insert_id($mysqli);
+
+    // Add Additional Assets
+    if (isset($_POST['additional_assets'])) {
+        foreach ($_POST['additional_assets'] as $additional_asset) {
+            $additional_asset_id = intval($additional_asset);
+            mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id");
+        }
+    }
+
+    logAction("Recurring Ticket", "Create", "$session_name created recurring ticket for $subject - $frequency", $client_id, $recurring_ticket_id);
+
+    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> created");
+
+    redirect();
+
+}
+
+if (isset($_POST['edit_recurring_ticket'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    require_once 'ticket_recurring_model.php';
+
+    $recurring_ticket_id = intval($_POST['recurring_ticket_id']);
+    $next_run_date = sanitizeInput($_POST['next_date']);
+
+    mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_next_run = '$next_run_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_asset_id = $asset_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_category = $category WHERE recurring_ticket_id = $recurring_ticket_id");
+
+    // Add Additional Assets
+    if (isset($_POST['additional_assets'])) {
+        mysqli_query($mysqli, "DELETE FROM recurring_ticket_assets WHERE recurring_ticket_id = $recurring_ticket_id");
+        foreach ($_POST['additional_assets'] as $additional_asset) {
+            $additional_asset_id = intval($additional_asset);
+            mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id");
+        }
+    }
+
+    logAction("Recurring Ticket", "Edit", "$session_name edited recurring ticket $subject", $client_id, $recurring_ticket_id);
+
+    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> updated");
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_force_recurring_tickets'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    enforceUserPermission('module_support', 2);
+
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        // Cycle through array and pop each recurring scheduled ticket
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+
+            $recurring_ticket_id = intval($recurring_ticket_id);
+            $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            if (mysqli_num_rows($sql) > 0) {
+                $row = mysqli_fetch_array($sql);
+                $subject = sanitizeInput($row['recurring_ticket_subject']);
+                $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']);
+                $priority = sanitizeInput($row['recurring_ticket_priority']);
+                $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency']));
+                $billable = intval($row['recurring_ticket_billable']);
+                $old_next_recurring_date = sanitizeInput($row['recurring_ticket_next_run']);
+                $created_id = intval($row['recurring_ticket_created_by']);
+                $assigned_id = intval($row['recurring_ticket_assigned_to']);
+                $contact_id = intval($row['recurring_ticket_contact_id']);
+                $client_id = intval($row['recurring_ticket_client_id']);
+                $asset_id = intval($row['recurring_ticket_asset_id']);
+                $category = intval($row['recurring_ticket_category']);
+                $url_key = randomString(156);
+
+                $ticket_status = 1; // Default
+                if ($assigned_id > 0) {
+                    $ticket_status = 2; // Set to open if we've auto-assigned an agent
+                }
+
+                // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php
+                $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
+                $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
+                $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
+                $config_base_url = sanitizeInput($config_base_url);
+
+                // Assign this new ticket the next ticket number & increment config_ticket_next_number by 1 (for the next ticket)
+                $ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1"));
+                $ticket_number = intval($ticket_number_sql['config_ticket_next_number']);
+                $new_config_ticket_next_number = $ticket_number + 1;
+                mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
+
+                // Raise the ticket
+                mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Recurring', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_category = $category, ticket_recurring_ticket_id = $recurring_ticket_id");
+                $id = mysqli_insert_id($mysqli);
+
+                // Copy Additional Assets from Recurring ticket to new ticket
+                mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id)
+                SELECT $id, asset_id
+                FROM recurring_ticket_assets
+                WHERE recurring_ticket_id = $recurring_ticket_id");
+
+                // Notifications
+
+                customAction('ticket_create', $id);
+
+                // Get client/contact/ticket details
+                $sql = mysqli_query(
+                    $mysqli,
+                    "SELECT client_name, contact_name, contact_email, ticket_prefix, ticket_number, ticket_priority, ticket_subject, ticket_details FROM tickets
+                LEFT JOIN clients ON ticket_client_id = client_id
+                LEFT JOIN contacts ON ticket_contact_id = contact_id
+                WHERE ticket_id = $id"
+                );
+                $row = mysqli_fetch_array($sql);
+
+                $contact_name = sanitizeInput($row['contact_name']);
+                $contact_email = sanitizeInput($row['contact_email']);
+                $client_name = sanitizeInput($row['client_name']);
+                $contact_name = sanitizeInput($row['contact_name']);
+                $contact_email = sanitizeInput($row['contact_email']);
+                $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+                $ticket_number = intval($row['ticket_number']);
+                $ticket_priority = sanitizeInput($row['ticket_priority']);
+                $ticket_subject = sanitizeInput($row['ticket_subject']);
+                $ticket_details = mysqli_real_escape_string($mysqli, $row['ticket_details']);
+
+                $data = [];
+
+                // Notify client by email their ticket has been raised, if general notifications are turned on & there is a valid contact email
+                if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
+
+                    $email_subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
+                    $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+
+                    $email = [
+                        'from' => $config_ticket_from_email,
+                        'from_name' => $config_ticket_from_name,
+                        'recipient' => $contact_email,
+                        'recipient_name' => $contact_name,
+                        'subject' => $email_subject,
+                        'body' => $email_body
+                    ];
+
+                    $data[] = $email;
+
+                }
+
+                // Add to the mail queue
+                addToMailQueue($data);
+
+                // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule)
+                $dt_old_next_recurring_date = new DateTime($old_next_recurring_date);
+                if ($frequency == "weekly") {
+                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 week'));
+                } elseif ($frequency == "monthly") {
+                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 month'));
+                } elseif ($frequency == "quarterly") {
+                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('3 months'));
+                } elseif ($frequency == "biannually") {
+                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('6 months'));
+                } elseif ($frequency == "annually") {
+                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('12 months'));
+                }
+
+                // Update the run date
+                $next_run = $next_run->format('Y-m-d');
+                mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id");
+
+                logAction("Ticket", "Create", "$session_name force created recurring scheduled $frequency ticket - $config_ticket_prefix$ticket_number - $subject", $client_id, $id);
+
+            }
+
+        }
+
+        flash_alert("$count Recurring Tickets Forced");
+    }
+
+    redirect();
+
+}
+
+if (isset($_GET['force_recurring_ticket'])) {
+
+    validateCSRFToken($_GET['csrf_token']);
+
+    enforceUserPermission('module_support', 2);
+
+    $recurring_ticket_id = intval($_GET['force_recurring_ticket']);
+
+    $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+
+    if (mysqli_num_rows($sql) > 0) {
+        $row = mysqli_fetch_array($sql);
+        $subject = sanitizeInput($row['recurring_ticket_subject']);
+        $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']);
+        $priority = sanitizeInput($row['recurring_ticket_priority']);
+        $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency']));
+        $billable = intval($row['recurring_ticket_billable']);
+        $old_next_recurring_date = sanitizeInput($row['recurring_ticket_next_run']);
+        $created_id = intval($row['recurring_ticket_created_by']);
+        $assigned_id = intval($row['recurring_ticket_assigned_to']);
+        $contact_id = intval($row['recurring_ticket_contact_id']);
+        $client_id = intval($row['recurring_ticket_client_id']);
+        $asset_id = intval($row['recurring_ticket_asset_id']);
+        $category = intval($row['recurring_ticket_category']);
+        $url_key = randomString(156);
+
+        $ticket_status = 1; // Default
+        if ($assigned_id > 0) {
+            $ticket_status = 2; // Set to open if we've auto-assigned an agent
+        }
+
+        // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php
+        $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
+        $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
+        $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
+        $config_base_url = sanitizeInput($config_base_url);
+
+        // Assign this new ticket the next ticket number & increment config_ticket_next_number by 1 (for the next ticket)
+        $ticket_number = $config_ticket_next_number;
+        $new_config_ticket_next_number = $config_ticket_next_number + 1;
+        mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
+
+        // Raise the ticket
+        mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Recurring', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_category = $category, ticket_recurring_ticket_id = $recurring_ticket_id");
+        $id = mysqli_insert_id($mysqli);
+
+        // Copy Additional Assets from Recurring ticket to new ticket
+        mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id)
+        SELECT $id, asset_id
+        FROM recurring_ticket_assets
+        WHERE recurring_ticket_id = $recurring_ticket_id");
+
+        // Notifications
+
+        customAction('ticket_create', $id);
+
+        // Get client/contact/ticket details
+        $sql = mysqli_query(
+            $mysqli,
+            "SELECT client_name, contact_name, contact_email, ticket_prefix, ticket_number, ticket_priority, ticket_subject, ticket_details FROM tickets
+                LEFT JOIN clients ON ticket_client_id = client_id
+                LEFT JOIN contacts ON ticket_contact_id = contact_id
+                WHERE ticket_id = $id"
+        );
+        $row = mysqli_fetch_array($sql);
+
+        $contact_name = sanitizeInput($row['contact_name']);
+        $contact_email = sanitizeInput($row['contact_email']);
+        $client_name = sanitizeInput($row['client_name']);
+        $contact_name = sanitizeInput($row['contact_name']);
+        $contact_email = sanitizeInput($row['contact_email']);
+        $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+        $ticket_number = intval($row['ticket_number']);
+        $ticket_priority = sanitizeInput($row['ticket_priority']);
+        $ticket_subject = sanitizeInput($row['ticket_subject']);
+        $ticket_details = mysqli_real_escape_string($mysqli, $row['ticket_details']);
+
+        $data = [];
+
+        // Notify client by email their ticket has been raised, if general notifications are turned on & there is a valid contact email
+        if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
+
+            $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
+            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+
+            $email = [
+                'from' => $config_ticket_from_email,
+                'from_name' => $config_ticket_from_name,
+                'recipient' => $contact_email,
+                'recipient_name' => $contact_name,
+                'subject' => $email_subject,
+                'body' => $email_body
+            ];
+
+            $data[] = $email;
+
+        }
+
+        // Add to the mail queue
+        addToMailQueue($data);
+
+        // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule)
+        $dt_old_next_recurring_date = new DateTime($old_next_recurring_date);
+        if ($frequency == "weekly") {
+            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 week'));
+        } elseif ($frequency == "monthly") {
+            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 month'));
+        } elseif ($frequency == "quarterly") {
+            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('3 months'));
+        } elseif ($frequency == "biannually") {
+            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('6 months'));
+        } elseif ($frequency == "annually") {
+            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('12 months'));
+        }
+
+        // Update the run date
+        $next_run = $next_run->format('Y-m-d');
+        mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id");
+
+        logAction("Ticket", "Create", "$session_name force created recurring scheduled $frequency ticket - $config_ticket_prefix$ticket_number - $subject", $client_id, $id);
+
+        flash_alert("Recurring Ticket Forced");
+
+        redirect();
+
+    } else {
+        flash_alert("Recurring Ticket Force failed", 'error');
+        redirect();
+    }
+
+}
+
+if (isset($_GET['delete_recurring_ticket'])) {
+
+    validateCSRFToken($_GET['csrf_token']);
+
+    enforceUserPermission('module_support', 3);
+
+    $recurring_ticket_id = intval($_GET['delete_recurring_ticket']);
+
+    // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message
+    $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+    $row = mysqli_fetch_array($sql);
+    $subject = sanitizeInput($row['recurring_ticket_subject']);
+    $frequency = sanitizeInput($row['recurring_ticket_frequency']);
+
+    $client_id = intval($row['recurring_ticket_client_id']);
+
+    // Delete
+    mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+
+    logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket $subject", $client_id, $recurring_ticket_id);
+
+    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> deleted", 'error');
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_delete_recurring_tickets'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    enforceUserPermission('module_support', 3);
+
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        $count = count($_POST['recurring_ticket_ids']);
+
+        // Cycle through array and delete each recurring scheduled ticket
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+
+            $recurring_ticket_id = intval($recurring_ticket_id);
+            mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket", 0, $recurring_ticket_id);
+
+        }
+
+        logAction("Recurring Ticket", "Bulk Delete", "$session_name deleted $count recurring ticket(s)");
+
+        flash_alert("Deleted <strong>$count</strong> recurring ticket(s)", 'error');
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_assign_recurring_ticket'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    // POST variables
+    $assign_to = intval($_POST['assign_to']);
+
+    // Get a Recurring Ticket Count
+    $recurring_ticket_count = count($_POST['recurring_ticket_ids']);
+
+    // Assign Tech to Selected Recurring Tickets
+    if (!empty($_POST['recurring_ticket_ids'])) {
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+            $recurring_ticket_id = intval($recurring_ticket_id);
+
+            $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+            $row = mysqli_fetch_array($sql);
+
+            $recurring_ticket_name = sanitizeInput($row['recurring_ticket_name']);
+            $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']);
+            $client_id = intval($row['recurring_ticket_client_id']);
+
+            // Allow for un-assigning tickets
+            if ($assign_to == 0) {
+                $ticket_reply = "Ticket unassigned, pending re-assignment.";
+                $agent_name = "No One";
+            } else {
+                // Get & verify assigned agent details
+                $agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assign_to");
+                $agent_details = mysqli_fetch_array($agent_details_sql);
+
+                $agent_name = sanitizeInput($agent_details['user_name']);
+                $agent_email = sanitizeInput($agent_details['user_email']);
+
+                if (!$agent_name) {
+                    flash_alert("Invalid agent!", 'error');
+                    redirect();
+                }
+            }
+
+            // Update recurring ticket
+            mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_assigned_to = $assign_to WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Recurring_Ticket", "Edit", "$session_name reassigned recurring ticket $recurring_ticket_subject to $agent_name", $client_id, $recurring_ticket_id);
+
+            $tickets_assigned_body .= "$recurring_ticket_subject<br>";
+        } // End For Each Ticket ID Loop
+
+        // Notification
+        if ($session_user_id != $assign_to && $assign_to != 0) {
+
+            // App Notification
+            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Recurring Ticket', notification = '$recurring_ticket_count Recurring Tickets have been assigned to you by $session_name', notification_action = 'recurring_tickets.php?assigned=$assign_to', notification_client_id = $client_id, notification_user_id = $assign_to");
+
+            // Agent Email Notification
+            if (!empty($config_smtp_host)) {
+
+                // Sanitize Config vars from get_settings.php
+                $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
+                $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
+                $company_name = sanitizeInput($session_company_name);
+
+                $subject = "$config_app_name - $recurring_ticket_count recurring tickets have been assigned to you";
+                $body = "Hi $agent_name, <br><br>$session_name assigned $recurring_ticket_count recurring tickets to you!<br><br>$tickets_assigned_body<br>Thanks, <br>$session_name<br>$company_name";
+
+                // Email Ticket Agent
+                // Queue Mail
+                $data = [
+                    [
+                        'from' => $config_ticket_from_email,
+                        'from_name' => $config_ticket_from_name,
+                        'recipient' => $agent_email,
+                        'recipient_name' => $agent_name,
+                        'subject' => $subject,
+                        'body' => $body,
+                    ]
+                ];
+                addToMailQueue($data);
+            }
+        }
+    }
+
+    flash_alert("Assigned <strong>$recurring_ticket_count</strong> Recurring Tickets to <strong>$agent_name</strong>");
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_edit_recurring_ticket_priority'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $priority = sanitizeInput($_POST['bulk_priority']);
+
+    // Assign Tech to Selected Recurring Tickets
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        // Get a Ticket Count
+        $recurring_ticket_count = count($_POST['recurring_ticket_ids']);
+
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+            $recurring_ticket_id = intval($recurring_ticket_id);
+
+            $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+            $row = mysqli_fetch_array($sql);
+
+            $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']);
+            $original_recurring_ticket_priority = sanitizeInput($row['recurring_ticket_priority']);
+            $client_id = intval($row['ticket_client_id']);
+
+            // Update recurring ticket
+            mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_priority = '$priority' WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Ticket", "Edit", "$session_name updated the priority on recurring ticket $ticket_subject from $original_recurring_ticket_priority to $priority", $client_id, $recurring_ticket_id);
+
+            customAction('recurring_ticket_update', $recurring_ticket_id);
+        } // End For Each Recurring Ticket ID Loop
+
+        logAction("Recurring Ticket", " Bulk Edit", "$session_name updated the priority to $priority on $recurring_ticket_count Recurring Tickets");
+
+        flash_alert("Priority updated to <strong>$priority</strong> for <strong>$recurring_ticket_count</strong> Recurring Tickets");
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_edit_recurring_ticket_category'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $category_id = intval($_POST['bulk_category']);
+
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        $recurring_ticket_count = count($_POST['recurring_ticket_ids']);
+
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+            $recurring_ticket_id = intval($recurring_ticket_id);
+
+            $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, category_name, recurring_ticket_client_id FROM recurring_tickets LEFT JOIN categories ON recurring_ticket_category = category_id WHERE recurring_ticket_id = $recurring_ticket_id");
+            $row = mysqli_fetch_array($sql);
+
+            $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']);
+            $previous_recurring_ticket_category_name = sanitizeInput($row['category_name']);
+            $client_id = intval($row['recurring_ticket_client_id']);
+
+            $category_name = sanitizeInput(getFieldById('categories', $category_id, 'category_name'));
+
+            mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_category = '$category_id' WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Recurring Ticket", "Edit", "$session_name updated the category on recurring ticket $recurring_ticket_subject from $previous_recurring_ticket_category_name to $category_name", $client_id, $recurring_ticket_id);
+
+            customAction('recurring_ticket_update', $recurring_ticket_id);
+        }
+
+        logAction("Recurring Ticket", " Bulk Edit", "$session_name updated the category to $category_name for $recurring_ticket_count Recurring Tickets");
+
+        flash_alert("Category set to $category_name for <strong>$recurring_ticket_count</strong> Recurring Tickets");
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_edit_recurring_ticket_billable'])) {
+
+    enforceUserPermission('module_support', 2);
+    enforceUserPermission('module_sales', 2);
+
+    $billable = intval($_POST['billable']);
+    if ($billable) {
+        $billable_status = "Billable";
+    } else {
+        $billable_status = "Not Billable";
+    }
+
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        $recurring_ticket_count = count($_POST['recurring_ticket_ids']);
+
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+            $recurring_ticket_id = intval($recurring_ticket_id);
+
+            $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, recurring_ticket_client_id FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+            $row = mysqli_fetch_array($sql);
+
+            $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']);
+            $previous_recurring_ticket_billable = intval($row['recurring_ticket_billable']);
+            if ($previous_recurring_ticket_billable) {
+                $previous_billable_status = "Billable";
+            } else {
+                $previous_billable_status = "Not Billable";
+            }
+            $client_id = intval($row['recurring_ticket_client_id']);
+
+            mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_billable = $billable WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Recurring Ticket", "Edit", "$session_name updated the billable status on recurring ticket $recurring_ticket_subject from $previous_billable_status to $billable_status", $client_id, $recurring_ticket_id);
+
+            customAction('recurring_ticket_update', $recurring_ticket_id);
+        }
+
+        logAction("Recurring Ticket", " Bulk Edit", "$session_name updated the billable status to $billable_status for $recurring_ticket_count Recurring Tickets");
+
+        flash_alert("Billable status set to $billable_status for <strong>$recurring_ticket_count</strong> Recurring Tickets");
+    }
+
+    redirect();
+
+}
+
+if (isset($_POST['bulk_edit_recurring_ticket_next_run_date'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $next_run_date = sanitizeInput($_POST['next_run_date']);
+
+    if (isset($_POST['recurring_ticket_ids'])) {
+
+        $recurring_ticket_count = count($_POST['recurring_ticket_ids']);
+
+        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
+            $recurring_ticket_id = intval($recurring_ticket_id);
+
+            $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, recurring_ticket_client_id FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
+            $row = mysqli_fetch_array($sql);
+
+            $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']);
+            $previous_recurring_ticket_next_run_date = sanitizeInput($row['recurring_ticket_next_run']);
+            $client_id = intval($row['recurring_ticket_client_id']);
+
+            mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run_date' WHERE recurring_ticket_id = $recurring_ticket_id");
+
+            logAction("Recurring Ticket", "Edit", "$session_name updated the Next run date on recurring ticket $recurring_ticket_subject from $previous_recurring_ticket_next_run_date to $next_run_date", $client_id, $recurring_ticket_id);
+
+            customAction('recurring_ticket_update', $recurring_ticket_id);
+        }
+
+        logAction("Recurring Ticket", " Bulk Edit", "$session_name updated the Next run date to $next_run_date for $recurring_ticket_count Recurring Tickets");
+
+        flash_alert("Next run date set to <strong>$next_run_date</strong> for <strong>$recurring_ticket_count</strong> Recurring Tickets");
+    }
+
+    redirect();
+
+}

agent/post/ticket.php

@@ -131,10 +131,9 @@ if (isset($_POST['add_ticket'])) {
         $company_name = sanitizeInput($row['company_name']);
         $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code']));
 
-
         // EMAILING
 
-        $subject = "Ticket created [$ticket_prefix$ticket_number] - $ticket_subject";
+        $subject = "Ticket Created [$ticket_prefix$ticket_number] - $ticket_subject";
         $body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: <a href=\'https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>View ticket</a><br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
         // Verify contact email is valid
@@ -234,7 +233,7 @@ if (isset($_POST['edit_ticket'])) {
     }
 
     // Get contact/ticket details after update for logging / email purposes
-    $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_category, ticket_details, ticket_status_name, ticket_created_by, ticket_assigned_to, ticket_client_id FROM tickets 
+    $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_category, ticket_details, ticket_status_name, ticket_created_by, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets 
         LEFT JOIN clients ON ticket_client_id = client_id 
         LEFT JOIN contacts ON ticket_contact_id = contact_id
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id               
@@ -251,6 +250,7 @@ if (isset($_POST['edit_ticket'])) {
     $ticket_status = sanitizeInput($row['ticket_status_name']);
     $ticket_created_by = intval($row['ticket_created_by']);
     $ticket_assigned_to = intval($row['ticket_assigned_to']);
+    $url_key = sanitizeInput($row['ticket_url_key']);
     $client_id = intval($row['ticket_client_id']);
 
     // Notify new contact if selected
@@ -416,6 +416,28 @@ if (isset($_POST['edit_ticket_contact'])) {
 
 }
 
+if (isset($_POST['edit_ticket_project'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $project_id = intval($_POST['project']);
+
+    $project_name = sanitizeInput(getFieldById('projects', $project_id, 'project_name'));
+    $client_id = intval(getFieldById('tickets', $ticket_id, 'ticket_client_id'));
+    $ticket_prefix = sanitizeInput(getFieldById('tickets', $ticket_id, 'ticket_prefix'));
+    $ticket_number = sanitizeInput(getFieldById('tickets', $ticket_id, 'ticket_number'));
+
+    mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
+
+    logAction("Ticket", "Edit", "$session_name set ticket $ticket_prefix$ticket_number project to $project_name", $client_id, $ticket_id);
+
+    flash_alert("Project changed to <strong>$project_name</strong> for Ticket <strong>$ticket_prefix$ticket_number</strong>");
+
+    redirect();
+
+}
+
 if (isset($_POST['add_ticket_watcher'])) {
 
     enforceUserPermission('module_support', 2);
@@ -1539,13 +1561,12 @@ if (isset($_POST['bulk_add_asset_ticket'])) {
 
 }
 
-
 if (isset($_POST['add_ticket_reply'])) {
 
     enforceUserPermission('module_support', 2);
 
     $ticket_id = intval($_POST['ticket_id']);
-    $ticket_reply = mysqli_real_escape_string($mysqli, $_POST['ticket_reply']);
+    $ticket_reply = $_POST['ticket_reply']; // Reply is SQL escaped below
     $ticket_status = intval($_POST['status']);
     $client_id = intval($_POST['client_id']);
 
@@ -1566,6 +1587,12 @@ if (isset($_POST['add_ticket_reply'])) {
     } else {
         $ticket_reply_type = 'Internal';
     }
+    // Add Signature to the end of the ticket reply if not Internal and if there is reply
+    if ($ticket_reply !== '' && $ticket_reply_type !== 'Internal') {
+        $ticket_reply .= getFieldById('user_settings',$session_user_id,'user_config_signature', 'raw');
+    }
+    
+    $ticket_reply = mysqli_escape_string($mysqli, $ticket_reply); // SQL Escape Ticket Reply
 
     // Update Ticket Status & updated at (in case status didn't change)
     mysqli_query($mysqli, "UPDATE tickets SET ticket_status = $ticket_status, ticket_updated_at = NOW() WHERE ticket_id = $ticket_id");
@@ -2231,387 +2258,6 @@ if (isset($_POST['export_tickets_csv'])) {
 
 }
 
-if (isset($_POST['add_recurring_ticket'])) {
-
-    enforceUserPermission('module_support', 2);
-
-    require_once 'ticket_recurring_model.php';
-
-    $start_date = sanitizeInput($_POST['start_date']);
-
-    mysqli_query($mysqli, "INSERT INTO recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_start_date = '$start_date', recurring_ticket_next_run = '$start_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_created_by = $session_user_id, recurring_ticket_client_id = $client_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_asset_id = $asset_id, recurring_ticket_category = $category");
-
-    $recurring_ticket_id = mysqli_insert_id($mysqli);
-
-    // Add Additional Assets
-    if (isset($_POST['additional_assets'])) {
-        foreach ($_POST['additional_assets'] as $additional_asset) {
-            $additional_asset_id = intval($additional_asset);
-            mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id");
-        }
-    }
-
-    logAction("Recurring Ticket", "Create", "$session_name created recurring ticket for $subject - $frequency", $client_id, $recurring_ticket_id);
-
-    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> created");
-
-    redirect();
-
-}
-
-if (isset($_POST['edit_recurring_ticket'])) {
-
-    enforceUserPermission('module_support', 2);
-
-    require_once 'ticket_recurring_model.php';
-
-    $recurring_ticket_id = intval($_POST['recurring_ticket_id']);
-    $next_run_date = sanitizeInput($_POST['next_date']);
-
-    mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_next_run = '$next_run_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_asset_id = $asset_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_category = $category WHERE recurring_ticket_id = $recurring_ticket_id");
-
-    // Add Additional Assets
-    if (isset($_POST['additional_assets'])) {
-        mysqli_query($mysqli, "DELETE FROM recurring_ticket_assets WHERE recurring_ticket_id = $recurring_ticket_id");
-        foreach ($_POST['additional_assets'] as $additional_asset) {
-            $additional_asset_id = intval($additional_asset);
-            mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id");
-        }
-    }
-
-    logAction("Recurring Ticket", "Edit", "$session_name edited recurring ticket $subject", $client_id, $recurring_ticket_id);
-
-    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> updated");
-
-    redirect();
-
-}
-
-if (isset($_POST['bulk_force_recurring_tickets'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    enforceUserPermission('module_support', 2);
-
-    if (isset($_POST['recurring_ticket_ids'])) {
-
-        // Cycle through array and pop each recurring scheduled ticket
-        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
-
-            $recurring_ticket_id = intval($recurring_ticket_id);
-            $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
-
-            if (mysqli_num_rows($sql) > 0) {
-                $row = mysqli_fetch_array($sql);
-                $subject = sanitizeInput($row['recurring_ticket_subject']);
-                $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']);
-                $priority = sanitizeInput($row['recurring_ticket_priority']);
-                $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency']));
-                $billable = intval($row['recurring_ticket_billable']);
-                $old_next_recurring_date = sanitizeInput($row['recurring_ticket_next_run']);
-                $created_id = intval($row['recurring_ticket_created_by']);
-                $assigned_id = intval($row['recurring_ticket_assigned_to']);
-                $contact_id = intval($row['recurring_ticket_contact_id']);
-                $client_id = intval($row['recurring_ticket_client_id']);
-                $asset_id = intval($row['recurring_ticket_asset_id']);
-                $category = intval($row['recurring_ticket_category']);
-                $url_key = randomString(156);
-
-                $ticket_status = 1; // Default
-                if ($assigned_id > 0) {
-                    $ticket_status = 2; // Set to open if we've auto-assigned an agent
-                }
-
-                // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php
-                $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
-                $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
-                $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
-                $config_base_url = sanitizeInput($config_base_url);
-
-                // Assign this new ticket the next ticket number & increment config_ticket_next_number by 1 (for the next ticket)
-                $ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1"));
-                $ticket_number = intval($ticket_number_sql['config_ticket_next_number']);
-                $new_config_ticket_next_number = $ticket_number + 1;
-                mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
-
-                // Raise the ticket
-                mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Recurring', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_category = $category, ticket_recurring_ticket_id = $recurring_ticket_id");
-                $id = mysqli_insert_id($mysqli);
-
-                // Copy Additional Assets from Recurring ticket to new ticket
-                mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id)
-                SELECT $id, asset_id
-                FROM recurring_ticket_assets
-                WHERE recurring_ticket_id = $recurring_ticket_id");
-
-                // Notifications
-
-                customAction('ticket_create', $id);
-
-                // Get client/contact/ticket details
-                $sql = mysqli_query(
-                    $mysqli,
-                    "SELECT client_name, contact_name, contact_email, ticket_prefix, ticket_number, ticket_priority, ticket_subject, ticket_details FROM tickets
-                LEFT JOIN clients ON ticket_client_id = client_id
-                LEFT JOIN contacts ON ticket_contact_id = contact_id
-                WHERE ticket_id = $id"
-                );
-                $row = mysqli_fetch_array($sql);
-
-                $contact_name = sanitizeInput($row['contact_name']);
-                $contact_email = sanitizeInput($row['contact_email']);
-                $client_name = sanitizeInput($row['client_name']);
-                $contact_name = sanitizeInput($row['contact_name']);
-                $contact_email = sanitizeInput($row['contact_email']);
-                $ticket_prefix = sanitizeInput($row['ticket_prefix']);
-                $ticket_number = intval($row['ticket_number']);
-                $ticket_priority = sanitizeInput($row['ticket_priority']);
-                $ticket_subject = sanitizeInput($row['ticket_subject']);
-                $ticket_details = mysqli_real_escape_string($mysqli, $row['ticket_details']);
-
-                $data = [];
-
-                // Notify client by email their ticket has been raised, if general notifications are turned on & there is a valid contact email
-                if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
-
-                    $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-                    $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
-
-                    $email = [
-                        'from' => $config_ticket_from_email,
-                        'from_name' => $config_ticket_from_name,
-                        'recipient' => $contact_email,
-                        'recipient_name' => $contact_name,
-                        'subject' => $email_subject,
-                        'body' => $email_body
-                    ];
-
-                    $data[] = $email;
-
-                }
-
-                // Add to the mail queue
-                addToMailQueue($data);
-
-                // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule)
-                $dt_old_next_recurring_date = new DateTime($old_next_recurring_date);
-                if ($frequency == "weekly") {
-                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 week'));
-                } elseif ($frequency == "monthly") {
-                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 month'));
-                } elseif ($frequency == "quarterly") {
-                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('3 months'));
-                } elseif ($frequency == "biannually") {
-                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('6 months'));
-                } elseif ($frequency == "annually") {
-                    $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('12 months'));
-                }
-
-                // Update the run date
-                $next_run = $next_run->format('Y-m-d');
-                mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id");
-
-                logAction("Ticket", "Create", "$session_name force created recurring scheduled $frequency ticket - $config_ticket_prefix$ticket_number - $subject", $client_id, $id);
-
-            }
-
-        }
-
-        flash_alert("$count Recurring Tickets Forced");
-    }
-
-    redirect();
-
-}
-
-if (isset($_GET['force_recurring_ticket'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    enforceUserPermission('module_support', 2);
-
-    $recurring_ticket_id = intval($_GET['force_recurring_ticket']);
-
-    $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
-
-    if (mysqli_num_rows($sql) > 0) {
-        $row = mysqli_fetch_array($sql);
-        $subject = sanitizeInput($row['recurring_ticket_subject']);
-        $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']);
-        $priority = sanitizeInput($row['recurring_ticket_priority']);
-        $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency']));
-        $billable = intval($row['recurring_ticket_billable']);
-        $old_next_recurring_date = sanitizeInput($row['recurring_ticket_next_run']);
-        $created_id = intval($row['recurring_ticket_created_by']);
-        $assigned_id = intval($row['recurring_ticket_assigned_to']);
-        $contact_id = intval($row['recurring_ticket_contact_id']);
-        $client_id = intval($row['recurring_ticket_client_id']);
-        $asset_id = intval($row['recurring_ticket_asset_id']);
-        $category = intval($row['recurring_ticket_category']);
-        $url_key = randomString(156);
-
-        $ticket_status = 1; // Default
-        if ($assigned_id > 0) {
-            $ticket_status = 2; // Set to open if we've auto-assigned an agent
-        }
-
-        // Sanitize Config Vars from get_settings.php and Session Vars from check_login.php
-        $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
-        $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
-        $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
-        $config_base_url = sanitizeInput($config_base_url);
-
-        // Assign this new ticket the next ticket number & increment config_ticket_next_number by 1 (for the next ticket)
-        $ticket_number = $config_ticket_next_number;
-        $new_config_ticket_next_number = $config_ticket_next_number + 1;
-        mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
-
-        // Raise the ticket
-        mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Recurring', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_category = $category, ticket_recurring_ticket_id = $recurring_ticket_id");
-        $id = mysqli_insert_id($mysqli);
-
-        // Copy Additional Assets from Recurring ticket to new ticket
-        mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id)
-        SELECT $id, asset_id
-        FROM recurring_ticket_assets
-        WHERE recurring_ticket_id = $recurring_ticket_id");
-
-        // Notifications
-
-        customAction('ticket_create', $id);
-
-        // Get client/contact/ticket details
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT client_name, contact_name, contact_email, ticket_prefix, ticket_number, ticket_priority, ticket_subject, ticket_details FROM tickets
-                LEFT JOIN clients ON ticket_client_id = client_id
-                LEFT JOIN contacts ON ticket_contact_id = contact_id
-                WHERE ticket_id = $id"
-        );
-        $row = mysqli_fetch_array($sql);
-
-        $contact_name = sanitizeInput($row['contact_name']);
-        $contact_email = sanitizeInput($row['contact_email']);
-        $client_name = sanitizeInput($row['client_name']);
-        $contact_name = sanitizeInput($row['contact_name']);
-        $contact_email = sanitizeInput($row['contact_email']);
-        $ticket_prefix = sanitizeInput($row['ticket_prefix']);
-        $ticket_number = intval($row['ticket_number']);
-        $ticket_priority = sanitizeInput($row['ticket_priority']);
-        $ticket_subject = sanitizeInput($row['ticket_subject']);
-        $ticket_details = mysqli_real_escape_string($mysqli, $row['ticket_details']);
-
-        $data = [];
-
-        // Notify client by email their ticket has been raised, if general notifications are turned on & there is a valid contact email
-        if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
-
-            $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
-
-            $email = [
-                'from' => $config_ticket_from_email,
-                'from_name' => $config_ticket_from_name,
-                'recipient' => $contact_email,
-                'recipient_name' => $contact_name,
-                'subject' => $email_subject,
-                'body' => $email_body
-            ];
-
-            $data[] = $email;
-
-        }
-
-        // Add to the mail queue
-        addToMailQueue($data);
-
-        // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule)
-        $dt_old_next_recurring_date = new DateTime($old_next_recurring_date);
-        if ($frequency == "weekly") {
-            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 week'));
-        } elseif ($frequency == "monthly") {
-            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 month'));
-        } elseif ($frequency == "quarterly") {
-            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('3 months'));
-        } elseif ($frequency == "biannually") {
-            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('6 months'));
-        } elseif ($frequency == "annually") {
-            $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('12 months'));
-        }
-
-        // Update the run date
-        $next_run = $next_run->format('Y-m-d');
-        mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id");
-
-        logAction("Ticket", "Create", "$session_name force created recurring scheduled $frequency ticket - $config_ticket_prefix$ticket_number - $subject", $client_id, $id);
-
-        flash_alert("Recurring Ticket Forced");
-
-        redirect();
-
-    } else {
-        flash_alert("Recurring Ticket Force failed", 'error');
-        redirect();
-    }
-
-}
-
-if (isset($_GET['delete_recurring_ticket'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    enforceUserPermission('module_support', 3);
-
-    $recurring_ticket_id = intval($_GET['delete_recurring_ticket']);
-
-    // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message
-    $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
-    $row = mysqli_fetch_array($sql);
-    $subject = sanitizeInput($row['recurring_ticket_subject']);
-    $frequency = sanitizeInput($row['recurring_ticket_frequency']);
-
-    $client_id = intval($row['recurring_ticket_client_id']);
-
-    // Delete
-    mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
-
-    logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket $subject", $client_id, $recurring_ticket_id);
-
-    flash_alert("Recurring ticket <strong>$subject - $frequency</strong> deleted", 'error');
-
-    redirect();
-
-}
-
-if (isset($_POST['bulk_delete_recurring_tickets'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    enforceUserPermission('module_support', 3);
-
-    if (isset($_POST['recurring_ticket_ids'])) {
-
-        $count = count($_POST['recurring_ticket_ids']);
-
-        // Cycle through array and delete each recurring scheduled ticket
-        foreach ($_POST['recurring_ticket_ids'] as $recurring_ticket_id) {
-
-            $recurring_ticket_id = intval($recurring_ticket_id);
-            mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id");
-
-            logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket", 0, $recurring_ticket_id);
-
-        }
-
-        logAction("Recurring Ticket", "Bulk Delete", "$session_name deleted $count recurring ticket(s)");
-
-        flash_alert("Deleted <strong>$count</strong> recurring ticket(s)", 'error');
-    }
-
-    redirect();
-
-}
-
 if (isset($_POST['edit_ticket_billable_status'])) {
 
     enforceUserPermission('module_support', 2);

agent/projects.php

@@ -94,34 +94,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+            <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned Date</label>
-                            <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date From</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date To</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
                 </div>

agent/quotes.php

@@ -75,34 +75,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+            <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned Date</label>
-                            <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date From</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date To</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
                 </div>

agent/recurring_expenses.php

@@ -51,34 +51,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <div class="col-sm-8">
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

agent/recurring_invoices.php

@@ -76,34 +76,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+            <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned Date</label>
-                            <select class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date From</label>
-                            <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date To</label>
-                            <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
                 </div>

agent/recurring_tickets.php

@@ -1,7 +1,7 @@
 <?php
 
 // Default Column Sortby Filter
-$sort = "recurring_ticket_subject";
+$sort = "recurring_ticket_next_run";
 $order = "ASC";
 
 // If client_id is in URI then show client Side Bar and client header
@@ -18,14 +18,38 @@ if (isset($_GET['client_id'])) {
 // Perms
 enforceUserPermission('module_support');
 
-// Ticket client access snippet
-$rec_ticket_permission_snippet = '';
-if (!empty($client_access_string)) {
-    $rec_ticket_permission_snippet = "AND recurring_ticket_client_id IN ($client_access_string)";
+// Category Filter
+if (isset($_GET['category']) & !empty($_GET['category'])) {
+    $category_query = 'AND (category_id = ' . intval($_GET['category']) . ')';
+    $category_filter = intval($_GET['category']);
+} else {
+    // Default - any
+    $category_query = '';
+    $category_filter = '';
 }
 
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
+// Assigned Agent Filter
+if (isset($_GET['assigned_agent']) & !empty($_GET['assigned_agent'])) {
+    $assigned_agent_query = 'AND (user_id = ' . intval($_GET['assigned_agent']) . ')';
+    $assigned_agent_filter = intval($_GET['assigned_agent']);
+} else {
+    // Default - any
+    $assigned_agent_query = '';
+    $assigned_agent_filter = '';
+}
+
+// Billable Filter
+if (isset($_GET['billable']) && $_GET['billable'] == 1) {
+    $billable_query = 'AND (recurring_ticket_billable = 1)';
+    $billable_filter = 1;
+} elseif (isset($_GET['billable']) && $_GET['billable'] == 0) {
+    $billable_query = 'AND (recurring_ticket_billable = 0)';
+    $billable_filter = 0;
+} else {
+    // Default - any
+    $billable_query = '';
+    $billable_filter = '';
+}
 
 // SQL
 $sql = mysqli_query(
@@ -35,7 +59,10 @@ $sql = mysqli_query(
     LEFT JOIN categories ON category_id = recurring_ticket_category
     LEFT JOIN users ON user_id = recurring_ticket_assigned_to
     WHERE (recurring_tickets.recurring_ticket_subject LIKE '%$q%' OR category_name LIKE '%$q%')
-    $rec_ticket_permission_snippet
+    $access_permission_query
+    $category_query
+    $assigned_agent_query
+    $billable_query
     $client_query
     ORDER BY
         CASE 
@@ -72,7 +99,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
         <form autocomplete="off">
             <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="client_id" value="<?= $client_id ?>">
             <?php } ?>
             <div class="row">
 
@@ -84,7 +111,54 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="col-md-8">
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <select class="form-control select2" name="category" onchange="this.form.submit()">
+                            <option value="">- All Categories -</option>
+
+                            <?php
+                            $sql_categories_filter = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND EXISTS (SELECT 1 FROM recurring_tickets WHERE recurring_ticket_category = category_id $client_query) ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql_categories_filter)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+                            ?>
+                                <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?= $category_id ?>"><?= $category_name ?></option>
+                            <?php
+                            }
+                            ?>
+
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <select class="form-control select2" name="assigned_agent" onchange="this.form.submit()">
+                            <option value="">- All Agents -</option>
+
+                            <?php
+                            $sql_assigned_agents_filter = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1 AND EXISTS (SELECT 1 FROM recurring_tickets WHERE recurring_ticket_assigned_to = user_id $client_query) ORDER BY user_name ASC");
+                            while ($row = mysqli_fetch_array($sql_assigned_agents_filter)) {
+                                $user_id = intval($row['user_id']);
+                                $user_name = nullable_htmlentities($row['user_name']);
+                            ?>
+                                <option <?php if ($assigned_agent_filter == $user_id) { echo "selected"; } ?> value="<?= $user_id ?>"><?= $user_name ?></option>
+                            <?php
+                            }
+                            ?>
+
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <select class="form-control select2" name="billable" onchange="this.form.submit()">
+                            <option value="">- Billable Status -</option>                    
+                            <option <?php if ($billable_filter == 1) { echo "selected"; } ?> value="1">Billable</option>
+                            <option <?php if ($billable_filter == 0) { echo "selected"; } ?> value="0">Non-Billable</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-md-2">
 
                     <?php if (lookupUserPermission("module_support") >= 2) { ?>
                         <div class="dropdown float-right" id="bulkActionButton" hidden>
@@ -93,9 +167,29 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <button class="dropdown-item" type="submit" form="bulkActions" name="bulk_force_recurring_tickets">
-                                    <i class="fa fa-fw fa-paper-plane text-secondary mr-2"></i>Force Reoccur
+                                    <i class="fas fa-fw fa-paper-plane mr-2"></i>Force Reoccur
                                 </button>
                                 <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignAgentRecurringTicketModal">
+                                    <i class="fas fa-fw fa-user-check mr-2"></i>Assign Agent
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryRecurringTicketModal">
+                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityRecurringTicketModal">
+                                    <i class="fas fa-fw fa-thermometer-half mr-2"></i>Set Priority
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditBillableRecurringTicketModal">
+                                    <i class="fas fa-fw fa-dollar-sign mr-2"></i>Set Billable
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditNextRunRecurringTicketModal">
+                                    <i class="fas fa-fw fa-calendar-day mr-2"></i>Set Next Run Date
+                                </a>
+                                <div class="dropdown-divider"></div>
                                 <button class="dropdown-item text-danger text-bold" type="submit" form="bulkActions" name="bulk_delete_recurring_tickets">
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
@@ -121,13 +215,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <?php if (!$client_url) { ?>
                             <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                                <a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=recurring_ticket_next_run&order=<?= $disp ?>">
+                                    Next Run Date <?php if ($sort == 'recurring_ticket_next_run') { echo $order_icon; } ?>
                                 </a>
                             </th>
-                            <?php } ?>
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=recurring_ticket_subject&order=<?php echo $disp; ?>">
                                     Subject <?php if ($sort == 'recurring_ticket_subject') { echo $order_icon; } ?>
@@ -148,16 +240,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Frequency <?php if ($sort == 'recurring_ticket_frequency') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            <th class="text-center">
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=recurring_ticket_billable&order=<?php echo $disp; ?>">
+                                    Billable <?php if ($sort == 'recurring_ticket_billable') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
-                                    Assigned <?php if ($sort == 'user_name') { echo $order_icon; } ?>
+                                    Agent <?php if ($sort == 'user_name') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            
+                            <?php if (!$client_url) { ?>
                             <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=recurring_ticket_next_run&order=<?php echo $disp; ?>">
-                                    Next Run Date <?php if ($sort == 'recurring_ticket_next_run') { echo $order_icon; } ?>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            <?php } ?>
                             <?php if (lookupUserPermission("module_support") >= 2) { ?>
                                 <th class="text-center">Action</th>
                             <?php } ?>
@@ -175,6 +275,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $recurring_ticket_priority = nullable_htmlentities($row['recurring_ticket_priority']);
                             $recurring_ticket_frequency = nullable_htmlentities($row['recurring_ticket_frequency']);
                             $recurring_ticket_next_run = nullable_htmlentities($row['recurring_ticket_next_run']);
+                            $recurring_ticket_billable = intval($row['recurring_ticket_billable']);
+                            if ($recurring_ticket_billable) {
+                                $recurring_ticket_billable_display = "<i class='fas fa-fw fa-check text-success'></i>";
+                            } else {
+                                $recurring_ticket_billable_display = "-";
+                            }
                             $recurring_ticket_category = getFallBack(nullable_htmlentities($row['category_name']));
                             $recurring_ticket_client_name = nullable_htmlentities($row['client_name']);
                             $assigned_to = getFallBack(nullable_htmlentities($row['user_name']));
@@ -183,27 +289,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <tr>
                                 <td class="pr-0">
                                     <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="recurring_ticket_ids[]" value="<?php echo $recurring_ticket_id ?>">
+                                        <input class="form-check-input bulk-select" type="checkbox" name="recurring_ticket_ids[]" value="<?= $recurring_ticket_id ?>">
                                     </div>
                                 </td>
-
-                                <?php if (!$client_url) { ?>
-                                <th><a href="recurring_tickets.php?client_id=<?php echo $recurring_ticket_client_id; ?>"><?php echo $recurring_ticket_client_name ?></a>
-                                </th>
-                                <?php } ?>
-
+                                <td class="text-bold"><?= $recurring_ticket_next_run ?></td>
                                 <td>
                                     <a class="ajax-modal" href="#"
                                         data-modal-size="lg"
                                         data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id=<?= $recurring_ticket_id ?>">
-                                        <?php echo $recurring_ticket_subject ?>
+                                        <?= $recurring_ticket_subject ?>
                                     </a>
                                 </td>
-                                <td><?php echo $recurring_ticket_category ?></td>
-                                <td><?php echo $recurring_ticket_priority ?></td>
-                                <td><?php echo $recurring_ticket_frequency ?></td>
-                                <td><?php echo $assigned_to ?></td>
-                                <td class="text-bold"><?php echo $recurring_ticket_next_run ?></td>
+                                <td><?= $recurring_ticket_category ?></td>
+                                <td><?= $recurring_ticket_priority ?></td>
+                                <td><?= $recurring_ticket_frequency ?></td>
+                                <td class="text-center"><?= $recurring_ticket_billable_display ?></td>
+                                <td><?= $assigned_to ?></td>
+                                <?php if (!$client_url) { ?>
+                                <th><a href="recurring_tickets.php?client_id=<?= $recurring_ticket_client_id ?>"><?= $recurring_ticket_client_name ?></a>
+                                </th>
+                                <?php } ?>
 
                                 <?php if (lookupUserPermission("module_support") >= 2) { ?>
                                     <td>
@@ -218,12 +323,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item" href="post.php?force_recurring_ticket=<?php echo $recurring_ticket_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                <a class="dropdown-item" href="post.php?force_recurring_ticket=<?= $recurring_ticket_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
                                                     <i class="fa fa-fw fa-paper-plane text-secondary mr-2"></i>Force Reoccur
                                                 </a>
                                                 <?php if (lookupUserPermission("module_support") == 3) { ?>
                                                     <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_recurring_ticket=<?php echo $recurring_ticket_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_recurring_ticket=<?= $recurring_ticket_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
                                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                                     </a>
                                                 <?php } ?>
@@ -239,6 +344,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
 
                 </table>
+                <?php
+                require_once "modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php";
+                require_once "modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php";
+                require_once "modals/recurring_ticket/recurring_ticket_bulk_category_edit.php";
+                require_once "modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php";
+                require_once "modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php";
+                ?>
 
             </form>
 

agent/reports/includes/inc_all_reports.php

@@ -1,17 +1,17 @@
 <?php
 
-require_once "../../config.php";
-require_once "../../functions.php";
-require_once "../../includes/check_login.php";
-require_once "../../includes/page_title.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
 // Reporting Perms
 enforceUserPermission('module_reporting');
-require_once "../../includes/header.php";
-require_once "../../includes/top_nav.php";
-require_once "includes/reports_side_nav.php";
-require_once "../../includes/inc_wrapper.php";
-require_once "../../includes/inc_alert_feedback.php";
-require_once "../../includes/filter_header.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/agent/reports/includes/reports_side_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';
 
 // Set variable default values
 $largest_income_month = 0;

agent/reports/includes/reports_side_nav.php

@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-primary d-print-none">
 
-    <a class="pb-1 mt-1 brand-link" href="../<?php echo $config_start_page ?>">
+    <a class="pb-1 mt-1 brand-link" href="/agent/<?php echo $config_start_page ?>">
         <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text ">Back | <strong>Reports</strong>
         </p>
@@ -18,55 +18,55 @@
                 <li class="nav-header">FINANCIAL</li>
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
                             <i class="far fa-circle nav-icon"></i>
                             <p>Income</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
                             <i class="far fa-user nav-icon"></i>
                             <p>Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
                             <i class="fa fa-sync nav-icon"></i>
                             <p>Recurring Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
                             <i class="fa fa-exclamation-triangle nav-icon"></i>
                             <p>Clients with a Balance</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
                             <i class="far fa-credit-card nav-icon"></i>
                             <p>Expense</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
                             <i class="far fa-building nav-icon"></i>
                             <p>Expense By Vendor</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
                             <i class="fas fa-percent nav-icon"></i>
                             <p>Tax Summary</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
                             <i class="fas fa-file-invoice-dollar nav-icon"></i>
                             <p>Profit & Loss</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Unbilled Tickets</p>
                         </a>
@@ -78,21 +78,21 @@
                 <li class="nav-header">TECHNICAL</li>
                 <?php  if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets by Client</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Time by Technician</p>
                         </a>
@@ -100,7 +100,7 @@
                 <?php } ?>
                 <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
+                        <a href="/agent/reports/credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-key"></i>
                             <p>Credential rotation</p>
                         </a>

agent/revenues.php

@@ -46,34 +46,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+            <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                 <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <div class="form-group">
-                            <label>Canned Date</label>
-                            <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date From</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label>Date To</label>
-                            <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                            <label>Date range</label>
+                            <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                            <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                            <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                            <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                         </div>
                     </div>
                 </div>

agent/ticket.php

@@ -620,7 +620,6 @@ if (isset($_GET['ticket_id'])) {
                                 <textarea
                                     class="form-control tinymceTicket" name="ticket_reply"
                                     placeholder="Type a response">
-                                    <?php echo nl2br(getFieldById('user_settings',$session_user_id,'user_config_signature','html')); ?>
                                 </textarea>
                             </div>
 
@@ -1227,9 +1226,9 @@ if (isset($_GET['ticket_id'])) {
                             <h5 class="card-title"><i class="fas fa-fw fa-project-diagram mr-2 mt-2"></i>Project</h5>
                             <div class="card-tools">
                                 <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm" href="#">
+                                    <button type="button" class="btn btn-light text-secondary btn-sm ajax-modal" data-modal-url="modals/ticket/ticket_edit_project.php?id=<?= $ticket_id ?>">
                                         <i class="fas fa-edit"></i>
-                                    </a>
+                                    </button>
                                 <?php } ?>
                             </div>
                         </div>

agent/ticket_list.php

@@ -9,7 +9,7 @@
                         <tr>
                             
                             <td>
-                                <?php if (isset($_GET['status']) && $_GET['status'] !== 'Closed') { ?>
+                                <?php if ($status !== 'Closed') { ?>
                                 <div class="form-check">
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
                                 </div>

agent/tickets.php

@@ -306,9 +306,7 @@ $sql_categories_filter = mysqli_query(
                 <div
                     class="collapse mt-3
                         <?php
-                        if (
-                            !empty($_GET['dtf'])
-                            || (isset($_GET['canned_date']) && $_GET['canned_date'] !== "custom")
+                        if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01'
                             || (isset($_GET['status']) && is_array($_GET['status'])
                             || (isset($_GET['assigned']) && $_GET['assigned']
                         )))
@@ -317,59 +315,13 @@ $sql_categories_filter = mysqli_query(
                     id="advancedFilter"
                 >
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") {
-                                        echo "selected";
-                                    } ?> value="custom">Custom
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "today") {
-                                        echo "selected";
-                                    } ?> value="today">Today
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") {
-                                        echo "selected";
-                                    } ?> value="yesterday">Yesterday
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") {
-                                        echo "selected";
-                                    } ?> value="thisweek">This Week
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") {
-                                        echo "selected";
-                                    } ?> value="lastweek">Last Week
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") {
-                                        echo "selected";
-                                    } ?> value="thismonth">This Month
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") {
-                                        echo "selected";
-                                    } ?> value="lastmonth">Last Month
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") {
-                                        echo "selected";
-                                    } ?> value="thisyear">This Year
-                                    </option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") {
-                                        echo "selected";
-                                    } ?> value="lastyear">Last Year
-                                    </option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                         <div class="col-md-3">

agent/transfers.php

@@ -69,34 +69,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" || $account_from_filter || $account_to_filter ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01' || $account_from_filter || $account_to_filter ) { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                         <div class="col-sm-2">

agent/trips.php

@@ -70,34 +70,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
+                <div class="collapse mt-3 <?php if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01') { echo "show"; } ?>" id="advancedFilter">
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-md-3">
                             <div class="form-group">
-                                <label>Canned Date</label>
-                                <select onchange="this.form.submit()" class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date From</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date To</label>
-                                <input onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                                <label>Date range</label>
+                                <input type="text" id="dateFilter" class="form-control" autocomplete="off">
+                                <input type="hidden" name="canned_date" id="canned_date" value="<?php echo nullable_htmlentities($_GET['canned_date']) ?? ''; ?>">
+                                <input type="hidden" name="dtf" id="dtf" value="<?php echo nullable_htmlentities($dtf ?? ''); ?>">
+                                <input type="hidden" name="dtt" id="dtt" value="<?php echo nullable_htmlentities($dtt ?? ''); ?>">
                             </div>
                         </div>
                     </div>

agent/user/includes/inc_all_user.php

@@ -1,13 +1,12 @@
 <?php
 
-require_once "../../config.php";
-require_once "../../functions.php";
-require_once "../../includes/check_login.php";
-require_once "../../includes/page_title.php";
-require_once "../../includes/header.php";
-require_once "../../includes/top_nav.php";
-require_once "includes/user_side_nav.php";
-require_once "../../includes/inc_wrapper.php";
-require_once "../../includes/inc_alert_feedback.php";
-require_once "../../includes/filter_header.php";
-
+require_once $_SERVER['DOCUMENT_ROOT'] . '/config.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/functions.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/check_login.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/page_title.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/top_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/agent/user/includes/user_side_nav.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_wrapper.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_alert_feedback.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/filter_header.php';

agent/user/includes/user_side_nav.php

@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
-    <a class="brand-link pb-1 mt-1" href="../<?php echo $config_start_page ?>">  
+    <a class="brand-link pb-1 mt-1" href="/agent/<?php echo $config_start_page ?>">
         <p class="h5">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> 
             <span class="brand-text">
@@ -19,28 +19,28 @@
             <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" role="menu" data-accordion="false">
 
                 <li class="nav-item">
-                    <a href="user_details.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_details.php") { echo "active"; } ?>">
+                    <a href="/agent/user/user_details.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_details.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-user"></i>
                         <p>Details</p>
                     </a>
                 </li>
 
                <li class="nav-item mt-2">
-                    <a href="user_security.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_security.php") { echo "active"; } ?>">
+                    <a href="/agent/user/user_security.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_security.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-shield-alt"></i>
                         <p>Security</p>
                     </a>
                 </li>
 
                 <li class="nav-item mt-2">
-                    <a href="user_preferences.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_preferences.php") { echo "active"; } ?>">
+                    <a href="/agent/user/user_preferences.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_preferences.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-cogs"></i>
                         <p>Preferences</p>
                     </a>
                 </li>
 
                 <li class="nav-item mt-2">
-                    <a href="user_activity.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_activity.php") { echo "active"; } ?>">
+                    <a href="/agent/user/user_activity.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "user_activity.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-clock"></i>
                         <p>Activity</p>
                     </a>

agent/user/post/profile.php

@@ -12,7 +12,7 @@ if (isset($_POST['edit_your_user_details'])) {
 
     $name = sanitizeInput($_POST['name']);
     $email = sanitizeInput($_POST['email']);
-    $signature = sanitizeInput($_POST['signature']);
+    $signature = mysqli_escape_string($mysqli,$_POST['signature']);
 
     $existing_file_name = sanitizeInput(getFieldById('users', $session_user_id, 'user_avatar'));
 

agent/user/user_details.php

@@ -58,12 +58,8 @@ require_once "includes/inc_all_user.php";
 
                     <div class="form-group">
                         <label>Signature</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-pen"></i></span>
-                            </div>
-                            <textarea class="form-control" name="signature" rows="4" placeholder="Create a signature automatically appended to tickets, emails etc"><?php echo getFieldById('user_settings',$session_user_id,'user_config_signature','html'); ?></textarea>
-                        </div>
+                        <textarea class="form-control tinymceTicket" name="signature" rows="4" placeholder="Create a signature automatically appended to tickets, emails etc"><?php echo getFieldById('user_settings',$session_user_id,'user_config_signature','html'); ?>
+                        </textarea>
                     </div>
                     
                     <button type="submit" name="edit_your_user_details" class="btn btn-primary btn-responsive"><i class="fas fa-check mr-2"></i>Save</button>

api/v1/custom/readme.php

@@ -0,0 +1,8 @@
+<?php
+
+/*
+
+- Custom Pages -
+     If you wish to add custom pages to ITFlow, add them to this directory"
+     Link to Documentation for File Directory Structure and examples
+*/

client/includes/check_login.php

@@ -16,18 +16,18 @@ if (!isset($_SESSION)) {
 }
 
 if (!isset($_SESSION['client_logged_in']) || !$_SESSION['client_logged_in']) {
-    header("Location: login.php");
+    header("Location: /client/login.php");
     die;
 }
 
 // Check user type
 if ($_SESSION['user_type'] !== 2) {
-    header("Location: login.php");
+    header("Location: /client/login.php");
     exit();
 }
 
 // Set Timezone
-require_once "../includes/inc_set_timezone.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_set_timezone.php';
 
 // User IP & UA
 $session_ip = sanitizeInput(getIP());

client/includes/footer.php

@@ -21,7 +21,7 @@
 </p>
 
 
-<?php require_once "../includes/inc_confirm_modal.php"; ?>
+<?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/inc_confirm_modal.php'; ?>
 
 <!-- jQuery -->
 <script src="/plugins/jquery/jquery.min.js"></script>