diff --git a/admin_project_template_add_modal.php b/admin_project_template_add_modal.php new file mode 100644 index 00000000..bf881aee --- /dev/null +++ b/admin_project_template_add_modal.php @@ -0,0 +1,41 @@ + diff --git a/admin_project_template_edit_modal.php b/admin_project_template_edit_modal.php new file mode 100644 index 00000000..149f1294 --- /dev/null +++ b/admin_project_template_edit_modal.php @@ -0,0 +1,44 @@ + diff --git a/admin_project_templates.php b/admin_project_templates.php new file mode 100644 index 00000000..3ef1ed3f --- /dev/null +++ b/admin_project_templates.php @@ -0,0 +1,128 @@ + + +
+
+

Project Templates

+
+ +
+
+
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + +
TemplateTicketsTasksAction
+ +
+ +
+ +
+
+
+ + 		00 +
+ +
+ + Edit + + +
+ + Delete + + +
+
+
+
+ +
+
+ + \ No newline at end of file + diff --git a/admin_ticket_template_add_modal.php b/admin_ticket_template_add_modal.php new file mode 100644 index 00000000..f9859a6d --- /dev/null +++ b/admin_ticket_template_add_modal.php @@ -0,0 +1,135 @@ + diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php new file mode 100644 index 00000000..d4c451b2 --- /dev/null +++ b/admin_ticket_template_details.php @@ -0,0 +1,125 @@ +set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); +$purifier = new HTMLPurifier($purifier_config); + +if (isset($_GET['ticket_template_id'])) { + $ticket_template_id = intval($_GET['ticket_template_id']); +} + +$sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + +$row = mysqli_fetch_array($sql_ticket_templates); + +$ticket_template_name = nullable_htmlentities($row['ticket_template_name']); +$ticket_template_description = nullable_htmlentities($row['ticket_template_description']); +$ticket_template_subject = nullable_htmlentities($row['ticket_template_subject']); +$ticket_template_details = $purifier->purify($row['ticket_template_details']); +$ticket_template_created_at = nullable_htmlentities($row['ticket_template_created_at']); +$ticket_template_updated_at = nullable_htmlentities($row['ticket_template_updated_at']); + +// Get Task Templates +$sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + +?> + +
    +
  1. + Home +
    2. +
  2. + Admin +
    3. +
  3. + Ticket Templates +
    4. +
    5. +
+ +
+
+ +
+
+

+
+ +
+

+
+
+
+

+
+ +
+
+
+
+ +
+
+ +
+ +
+ +
+
+
Tasks
+
+
+
+ +
+
+
+ +
+ +
+ +
+
+
+
+ + + + + + + + +
+ + + +
+
+
+ +
+ +
+ + + + +
+
+
+
Editing Ticket Template:
+ +
+
+ +
+ + +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+
+
+
+ diff --git a/admin_ticket_templates.php b/admin_ticket_templates.php new file mode 100644 index 00000000..489fce83 --- /dev/null +++ b/admin_ticket_templates.php @@ -0,0 +1,128 @@ + + +
+
+

Ticket Templates

+
+ +
+
+
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ + "> + + + + + + + + + + + + + + + + + +
TemplateTasksAction
+ +
+ +
+ +
+
+
+ + 		0 +
+ +
+ + Edit + + +
+ + Delete + + +
+
+
+
+ +
+
+ + Details +
  • + Certificate +
  • Notes
    • -
    @@ -47,6 +49,32 @@ + + +
    + +
    +
    + +
    + +
    +
    + + + +
    +
    @@ -86,30 +114,10 @@
    - +
    -
    - -
    -
    - -
    - -
    -
    -
    diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php index f6884fcb..19208e19 100644 --- a/client_certificate_edit_modal.php +++ b/client_certificate_edit_modal.php @@ -12,83 +12,112 @@
    -
    - -
    -
    - -
    - -
    -
    + -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    -  https:// -
    - -
    - -
    -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    - -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - +
    + +
    + +
    + +
    +
    +  https:// +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    +
    diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php index 4f3c371e..57a4a3a1 100644 --- a/client_domain_edit_modal.php +++ b/client_domain_edit_modal.php @@ -19,6 +19,9 @@
  • Records
    • +
  • + Notes +
    • @@ -79,11 +82,6 @@
    -
    - - -
    -
    @@ -140,6 +138,12 @@
    +
    +
    + +
    +
    +
    diff --git a/client_network_add_modal.php b/client_network_add_modal.php index cef6383a..5f35b82f 100644 --- a/client_network_add_modal.php +++ b/client_network_add_modal.php @@ -15,6 +15,12 @@
  • Details
    • +
  • + Network +
    • +
  • + DNS +
  • Notes
    • @@ -46,46 +52,6 @@
    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    @@ -111,6 +77,82 @@
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    +
    diff --git a/client_network_edit_modal.php b/client_network_edit_modal.php index 12ee0c52..452cde19 100644 --- a/client_network_edit_modal.php +++ b/client_network_edit_modal.php @@ -12,81 +12,147 @@
    -
    - -
    -
    - -
    - -
    -
    + -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    - -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    +
    diff --git a/client_networks.php b/client_networks.php index c8a0cc91..63717dc2 100644 --- a/client_networks.php +++ b/client_networks.php @@ -16,7 +16,7 @@ $sql = mysqli_query( LEFT JOIN locations ON location_id = network_location_id WHERE network_client_id = $client_id AND network_archived_at IS NULL - AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') + AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -88,8 +88,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Name vLAN - Network + IP / Network Gateway + DNS DHCP Range Location Action @@ -103,13 +104,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $network_name = nullable_htmlentities($row['network_name']); $network_description = nullable_htmlentities($row['network_description']); $network_vlan = intval($row['network_vlan']); - if (empty($network_vlan)) { - $network_vlan_display = "-"; - } else { + if ($network_vlan) { $network_vlan_display = $network_vlan; + } else { + $network_vlan_display = "-"; } $network = nullable_htmlentities($row['network']); + $network_subnet = nullable_htmlentities($row['network_subnet']); $network_gateway = nullable_htmlentities($row['network_gateway']); + $network_primary_dns = nullable_htmlentities($row['network_primary_dns']); + $network_secondary_dns = nullable_htmlentities($row['network_secondary_dns']); + if ($network_primary_dns && $network_secondary_dns) { + $network_dns_display = "$network_primary_dns
    $network_secondary_dns
    "; + } else { + $network_dns_display = "-"; + } $network_dhcp_range = nullable_htmlentities($row['network_dhcp_range']); if (empty($network_dhcp_range)) { $network_dhcp_range_display = "-"; @@ -144,8 +153,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + +
    + + diff --git a/client_tickets.php b/client_tickets.php index eba4013c..d51bde86 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -180,6 +180,9 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); } else { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + + $project_id = intval($row['ticket_project_id']); + $contact_name = nullable_htmlentities($row['contact_name']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); @@ -197,7 +200,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); // Get who last updated the ticket - to be shown in the last Response column $ticket_reply_type = "Client"; // Default to client for unreplied tickets $ticket_reply_by_display = ""; // Default none - $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, ticket_reply_created_at, contact_name, user_name FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id @@ -213,11 +216,13 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); } else { $ticket_reply_by_display = nullable_htmlentities($row['user_name']); } + $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); + $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); } ?> - "> + "> @@ -265,7 +270,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); -
    +
    diff --git a/database_updates.php b/database_updates.php index 67d8f09c..aff41310 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1688,7 +1688,6 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '1.1.3') { - mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_subnet` VARCHAR(200) DEFAULT NULL AFTER `network`"); mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_primary_dns` VARCHAR(200) DEFAULT NULL AFTER `network_gateway`"); mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_secondary_dns` VARCHAR(200) DEFAULT NULL AFTER `network_primary_dns`"); diff --git a/database_version.php b/database_version.php index f933d1f9..e6a7ca45 100644 --- a/database_version.php +++ b/database_version.php @@ -6,4 +6,3 @@ */ DEFINE("LATEST_DATABASE_VERSION", "1.1.6"); - diff --git a/db.sql b/db.sql index 47b15f0f..5478e4eb 100644 --- a/db.sql +++ b/db.sql @@ -1879,4 +1879,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- As of 2024 03 29 +-- As of 2024 03 29 \ No newline at end of file diff --git a/js/network_edit_modal.js b/js/network_edit_modal.js index f2ba62ca..217cc350 100644 --- a/js/network_edit_modal.js +++ b/js/network_edit_modal.js @@ -20,7 +20,10 @@ function populateNetworkEditModal(client_id, network_id) { document.getElementById("editNetworkDescription").value = network.network_description; document.getElementById("editNetworkVlan").value = network.network_vlan; document.getElementById("editNetworkCidr").value = network.network; + document.getElementById("editNetworkSubnet").value = network.network_subnet; document.getElementById("editNetworkGw").value = network.network_gateway; + document.getElementById("editNetworkPrimaryDNS").value = network.network_primary_dns; + document.getElementById("editNetworkSecondaryDNS").value = network.network_secondary_dns; document.getElementById("editNetworkDhcp").value = network.network_dhcp_range; document.getElementById("editNetworkNotes").value = network.network_notes; diff --git a/post.php b/post.php index 40a878d0..4bca0669 100644 --- a/post.php +++ b/post.php @@ -11,6 +11,9 @@ require_once "functions.php"; require_once "check_login.php"; // Load specific module logic + +require_once "post/admin.php"; + require_once "post/account.php"; require_once "post/account_type.php"; @@ -55,6 +58,8 @@ require_once "post/product.php"; require_once "post/profile.php"; +require_once "post/project.php"; + require_once "post/quote.php"; require_once "post/revenue.php"; @@ -71,6 +76,8 @@ require_once "post/tax.php"; require_once "post/ticket.php"; +require_once "post/tasks.php"; + require_once "post/transfer.php"; require_once "post/trip.php"; @@ -85,5 +92,3 @@ require_once "post/ai.php"; require_once "post/misc.php"; - -?> diff --git a/post/admin.php b/post/admin.php new file mode 100644 index 00000000..66929fe2 --- /dev/null +++ b/post/admin.php @@ -0,0 +1,196 @@ +$name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_project_template'])) { + + validateTechRole(); + $project_template_id = intval($_POST['project_template_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + + mysqli_query($mysqli, "UPDATE project_templates SET project_template_name = '$name', project_template_description = '$description' WHERE project_template_id = $project_template_id"); + + $ticket_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project Template', log_action = 'Edit', log_description = '$session_name edited Project template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $project_template_id"); + + $_SESSION['alert_message'] = "You edited Project Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_project_template'])) { + + validateTechRole(); + + $project_template_id = intval($_GET['delete_project_template']); + + // Get project template name + $sql = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_id = $project_template_id"); + $row = mysqli_fetch_array($sql); + $project_template_name = sanitizeInput($row['project_template_name']); + + mysqli_query($mysqli, "DELETE FROM project_templates WHERE project_template_id = $project_template_id"); + + // Delete Associated Ticket Tasks + // First we need to get ticket_template_id Get ticket Templates + $sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_project_template_id = $project_template_id"); + while($row = mysqli_fetch_array($sql_ticket_templates)) { + $ticket_template_id = intval($row['ticket_template_id']); + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + } + + // Then Delete Associated Ticket Templates + mysqli_query($mysqli, "DELETE FROM ticket_templates WHERE ticket_template_project_template_id = $project_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project Template', log_action = 'Delete', log_description = '$session_name deleted ticket template $project_template_name and its associated ticket templates and its tasks', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $project_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Project Template $project_template_name and its associated ticket templates and tasks"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['add_ticket_template'])) { + + validateTechRole(); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $subject = sanitizeInput($_POST['subject']); + $details = mysqli_real_escape_string($mysqli, $_POST['details']); + $project_template_id = intval($_POST['project_template']); + + mysqli_query($mysqli, "INSERT INTO ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details', ticket_template_project_template_id = $project_template_id"); + + $ticket_template_id = mysqli_insert_id($mysqli); + + // Add Tasks to ticket template + if (!empty($_POST['tasks'])) { + foreach($_POST['tasks'] as $task) { + $task_template_name = sanitizeInput($task); + if (!empty($task_template_name)) { + mysqli_query($mysqli,"INSERT INTO task_templates SET task_template_name = '$task_template_name', task_templates_ticket_template_id = $ticket_template_id"); + } + } + } + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket Template', log_action = 'Create', log_description = '$session_name created ticket template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_message'] = "You created Ticket Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_ticket_template'])) { + + validateTechRole(); + $ticket_template_id = intval($_POST['ticket_template_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $subject = sanitizeInput($_POST['subject']); + $details = mysqli_real_escape_string($mysqli, $_POST['details']); + $project_template_id = intval($_POST['project_template']); + + mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details', ticket_template_project_template_id = $project_template_id WHERE ticket_template_id = $ticket_template_id"); + + $ticket_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket Template', log_action = 'Edit', log_description = '$session_name edited ticket template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_message'] = "You edited Ticket Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_ticket_template'])) { + + validateTechRole(); + + $ticket_template_id = intval($_GET['delete_ticket_template']); + + // Get ticket template name + $sql = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + $row = mysqli_fetch_array($sql); + $ticket_template_name = sanitizeInput($row['ticket_template_name']); + + mysqli_query($mysqli, "DELETE FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + + // Delete Associated Tasks + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket Template', log_action = 'Delete', log_description = '$session_name deleted ticket template $ticket_template_name and its tasks', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Ticket Template $ticket_template_name and its associated tasks"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['add_ticket_template_task'])) { + + validateTechRole(); + $ticket_template_id = intval($_POST['ticket_template_id']); + $task_name = sanitizeInput($_POST['task_name']); + + mysqli_query($mysqli, "INSERT INTO task_templates SET task_template_name = '$task_name', task_template_ticket_template_id = $ticket_template_id"); + + $task_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task Template', log_action = 'Create', log_description = '$session_name created task template $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_message'] = "You created Task Template $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_task_template'])) { + + validateTechRole(); + + $task_template_id = intval($_GET['delete_task_template']); + + // Get task template name + $sql = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_id = $task_template_id"); + $row = mysqli_fetch_array($sql); + $task_template_name = sanitizeInput($row['task_template_name']); + + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_id = $task_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task Template', log_action = 'Delete', log_description = '$session_name deleted task template $task_template_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $task_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Task Template $task_template_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} diff --git a/post/network.php b/post/network.php index 36bcbca7..338fc706 100644 --- a/post/network.php +++ b/post/network.php @@ -13,12 +13,15 @@ if (isset($_POST['add_network'])) { $description = sanitizeInput($_POST['description']); $vlan = intval($_POST['vlan']); $network = sanitizeInput($_POST['network']); + $subnet = sanitizeInput($_POST['subnet']); $gateway = sanitizeInput($_POST['gateway']); + $primary_dns = sanitizeInput($_POST['primary_dns']); + $secondary_dns = sanitizeInput($_POST['secondary_dns']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); - mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); $network_id = mysqli_insert_id($mysqli); @@ -40,13 +43,16 @@ if (isset($_POST['edit_network'])) { $description = sanitizeInput($_POST['description']); $vlan = intval($_POST['vlan']); $network = sanitizeInput($_POST['network']); + $subnet = sanitizeInput($_POST['subnet']); $gateway = sanitizeInput($_POST['gateway']); + $primary_dns = sanitizeInput($_POST['primary_dns']); + $secondary_dns = sanitizeInput($_POST['secondary_dns']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); $client_id = intval($_POST['client_id']); - mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); + mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Network', log_action = 'Modify', log_description = '$session_name modified network $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $network_id"); @@ -158,12 +164,12 @@ if (isset($_POST['export_client_networks_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Description', 'vLAN', 'Network', 'Gateway', 'DHCP Range'); + $fields = array('Name', 'Description', 'vLAN', 'IP/Network', 'Subnet Mask', 'Gateway', 'Primary DNS', 'Secondary DNS', 'DHCP Range'); 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['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_gateway'], $row['network_dhcp_range']); + $lineData = array($row['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_subnet'], $row['network_gateway'], $row['network_primary_dns'], $row['network_secondary_dns'], $row['network_dhcp_range']); fputcsv($f, $lineData, $delimiter); } diff --git a/post/project.php b/post/project.php new file mode 100644 index 00000000..e6118aba --- /dev/null +++ b/post/project.php @@ -0,0 +1,68 @@ +$project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['edit_project'])) { + + validateTechRole(); + + $project_id = intval($_POST['project_id']); + $project_name = sanitizeInput($_POST['name']); + $project_description = sanitizeInput($_POST['description']); + $client_id = intval($_POST['client_id']); + + mysqli_query($mysqli, "UPDATE projects SET project_name = '$project_name', project_description = '$project_description' WHERE project_id = $project_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project', log_action = 'Edit', log_description = '$session_name edited project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id"); + + $_SESSION['alert_message'] = "You edited Project $project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + + +if (isset($_GET['delete_project'])) { + + validateTechRole(); + + $project_id = intval($_GET['delete_project']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['project_client_id']); + $project_name = sanitizeInput($row['project_name']); + + mysqli_query($mysqli, "DELETE FROM projects WHERE project_id = $project_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Projects', log_action = 'Delete', log_description = '$session_name deleted project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Project $project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} diff --git a/post/tasks.php b/post/tasks.php new file mode 100644 index 00000000..0dd09069 --- /dev/null +++ b/post/tasks.php @@ -0,0 +1,101 @@ +$task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['edit_task'])) { + + validateTechRole(); + + $task_id = intval($_POST['task_id']); + $task_name = sanitizeInput($_POST['name']); + $task_description = sanitizeInput($_POST['description']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + + mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_description = '$task_description' WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Edit', log_description = '$session_name edited task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_message'] = "You edited Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + + +if (isset($_GET['delete_task'])) { + + validateTechRole(); + + $task_id = intval($_GET['delete_task']); + + // Get Client ID, task name from tasks and tickets using the task_id + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + $task_name = sanitizeInput($row['task_name']); + + mysqli_query($mysqli, "DELETE FROM tasks WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Delete', log_description = '$session_name deleted task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['complete_task'])) { + + validateTechRole(); + + $task_id = intval($_GET['complete_task']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + $task_name = sanitizeInput($row['task_name']); + $ticket_id = intval($row['ticket_id']); + + mysqli_query($mysqli, "UPDATE tasks SET task_completed_at = NOW(), task_completed_by = $session_user_id WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Edit', log_description = '$session_name completed task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_message'] = "You completed Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/post/ticket.php b/post/ticket.php index 468020c1..e3f302ef 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -23,6 +23,7 @@ if (isset($_POST['add_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $use_primary_contact = intval($_POST['use_primary_contact']); @@ -51,10 +52,21 @@ if (isset($_POST['add_ticket'])) { 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_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id"); $ticket_id = mysqli_insert_id($mysqli); + // 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 Watchers if (!empty($_POST['watchers'])) { foreach ($_POST['watchers'] as $watcher) { @@ -154,10 +166,11 @@ if (isset($_POST['edit_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $client_id = intval($_POST['client_id']); $ticket_number = intval($_POST['ticket_number']); - mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id"); //Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name modified ticket $ticket_number - $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id"); diff --git a/project_add_modal.php b/project_add_modal.php new file mode 100644 index 00000000..6cbb25ba --- /dev/null +++ b/project_add_modal.php @@ -0,0 +1,63 @@ + diff --git a/project_details.php b/project_details.php new file mode 100644 index 00000000..5adf390c --- /dev/null +++ b/project_details.php @@ -0,0 +1,352 @@ +

    Nothing to see here

    Go Back"; + + include_once "footer.php"; + exit; + } + + $row = mysqli_fetch_array($sql_project); + + $project_id = intval($row['project_id']); + $project_name = nullable_htmlentities($row['project_name']); + $project_description = nullable_htmlentities($row['project_description']); + $project_created_at = date("Y-m-d", strtotime($row['project_created_at'])); + $project_updated_at = nullable_htmlentities($row['project_updated_at']); + + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_project_id = $project_id ORDER BY ticket_number DESC"); + $ticket_count = mysqli_num_rows($sql_tickets); + + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_status = 'Closed'"); + + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + if($ticket_count) { + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + } + + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + ORDER BY task_created_at ASC" + ); + $task_count = mysqli_num_rows($sql_tasks); + + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + if($task_count) { + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; + } +?> + + +
      +
    1. + Projects +
      2. +
    2. Project Details
      3. +
    + + +
    +
    +
    +
    + +
    +

    +
    +
    +
    +
    +
    +
    + +
    +

    +
    +
    +
    +
    + +
    + +
    + +
    /
    +
    + + +
    + +
    /
    +
    + +
    + +
    +
    +
    + +
    + + Edit + + + Add Ticket + + +
    + + Archive + + + +
    + + Delete + + +
    +
    +
    +
    +
    +
    + +
    +
    + + + 0) { ?> +
    + +
    Tickets
    +
    + + + + + + + + + + + + + Never

    "; + } else { + $ticket_updated_at_display = "

    Never

    "; + } + } else { + $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; + } + $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + + $ticket_status_color = getTicketStatusColor($ticket_status); + + if ($ticket_priority == "High") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Low") { + $ticket_priority_display = "$ticket_priority"; + } else{ + $ticket_priority_display = "-"; + } + + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if ($ticket_status == "Closed") { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } else { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + $project_id = intval($row['ticket_project_id']); + + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_email = nullable_htmlentities($row['contact_email']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } + if (empty($contact_name)) { + $contact_display = "-"; + } else { + $contact_display = "$contact_archived_display$contact_name
    $contact_email"; + } + + // Get who last updated the ticket - to be shown in the last Response column + $ticket_reply_type = "Client"; // Default to client for unreplied tickets + $ticket_reply_by_display = ""; // Default none + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + LEFT JOIN users ON ticket_reply_by = user_id + LEFT JOIN contacts ON ticket_reply_by = contact_id + WHERE ticket_reply_ticket_id = $ticket_id + AND ticket_reply_archived_at IS NULL + ORDER BY ticket_reply_id DESC LIMIT 1" + ); + $row = mysqli_fetch_array($sql_ticket_reply); + + if ($row) { + $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); + if ($ticket_reply_type == "Client") { + $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); + } else { + $ticket_reply_by_display = nullable_htmlentities($row['user_name']); + } + } + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NumberSubjectPriorityStatusAssignedLast Response
    + + + + + + +
    +
    +
    +
    +
    + +
    + +
    + + + 0) { ?> +
    +
    Tasks
    + + + + +
    + +
    + +
    + + +
    + + + + + + +
    + +
    + + + + +
    + + + +
    + +
    + + + + diff --git a/project_edit_modal.php b/project_edit_modal.php new file mode 100644 index 00000000..5599efa0 --- /dev/null +++ b/project_edit_modal.php @@ -0,0 +1,43 @@ + diff --git a/projects.php b/projects.php new file mode 100644 index 00000000..c56772a9 --- /dev/null +++ b/projects.php @@ -0,0 +1,216 @@ + + +
    +
    +

    Projects

    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    " id="advancedFilter"> +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + + + +
    ProjectTickets / TasksDueClientCreatedAction
    + +
    + +
    +
    +
    +
    +
    +     +     		+ +
    + +
    /
    +
    + + +
    + +
    /
    +
    + +     		Next Week + + + + +
    + +
    + + Edit + +
    + + Delete + +
    +
    +
    +
    + +
    +
    + + +
  • + "> + +

    Projects

    +     +
    • +
  • diff --git a/task_add_modal.php b/task_add_modal.php new file mode 100644 index 00000000..4f0b3317 --- /dev/null +++ b/task_add_modal.php @@ -0,0 +1,45 @@ + diff --git a/task_edit_modal.php b/task_edit_modal.php new file mode 100644 index 00000000..96a6a711 --- /dev/null +++ b/task_edit_modal.php @@ -0,0 +1,45 @@ + diff --git a/ticket.php b/ticket.php index 08231ff9..e128714d 100644 --- a/ticket.php +++ b/ticket.php @@ -92,6 +92,8 @@ if (isset($_GET['ticket_id'])) { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + $project_id = intval($row['ticket_project_id']); + $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); @@ -229,6 +231,10 @@ if (isset($_GET['ticket_id'])) { ); + // Get Watchers + $sql_ticket_watchers = mysqli_query($mysqli, "SELECT * FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id ORDER BY watcher_email DESC"); + + // Get Ticket Attachments $sql_ticket_attachments = mysqli_query( $mysqli, @@ -237,6 +243,10 @@ if (isset($_GET['ticket_id'])) { AND ticket_attachment_ticket_id = $ticket_id" ); + + // Get Tasks + $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_created_at ASC"); + ?> @@ -251,13 +261,54 @@ if (isset($_GET['ticket_id'])) {
    -
    + +

    Ticket

    - -
    -
    - +
    + + Create Task + +
    + + Add Contact + + + Add Asset + + + Add Vendor + + + Add Watcher + +
    +
    + + + + + Invoice + + + + Close + + +
    +
    @@ -278,8 +329,9 @@ if (isset($_GET['ticket_id'])) {
    +
    - +
    @@ -459,13 +511,12 @@ if (isset($_GET['ticket_id'])) { ?> -
    mb-3"> +
    mb-3">

    @@ -542,22 +593,91 @@ if (isset($_GET['ticket_id'])) {
    - +
    -
    +
    +
    + +
    +
    + +
    +
    + Updated: +
    + + + if ($ticket_status == "Closed") { + $sql_closed_by = mysqli_query($mysqli, "SELECT * FROM tickets, users WHERE ticket_closed_by = user_id"); + $row = mysqli_fetch_array($sql_closed_by); + $ticket_closed_by_display = nullable_htmlentities($row['user_name']); + ?>
    - + Closed by: +
    +
    + Feedback:
    + -
    + // Ticket scheduling + if (empty ($ticket_closed_at)) { ?> +
    + Scheduled: +
    + +
    + Total time worked: +
    + +
    + Billable: + + $"; + } else { + echo "X"; + } + ?> + +
    +
    + + +
    + + + +
    +
    + +
    + +
    +
    +
    - + +
    @@ -566,7 +686,7 @@ if (isset($_GET['ticket_id'])) { @@ -574,25 +694,25 @@ if (isset($_GET['ticket_id'])) { if (!empty($location_name)) { ?>
    - +
    - +
    - +
    - +
    @@ -612,11 +732,11 @@ if (isset($_GET['ticket_id'])) {
    - Previous ticket: + Previous ticket:
    - Status: + Status:
    @@ -630,32 +750,86 @@ if (isset($_GET['ticket_id'])) { - - +
    +
    Tasks
    +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    + + + + + + + + +
    + + + + + + + + +
    +
    + +
    + + Edit + +
    + + Delete + +
    +
    +
    +
    +
    + - if ($ticket_status !== "Closed" || mysqli_num_rows($sql_ticket_watchers) > 0) { ?> + + + 0) { ?>
    Watchers
    - -
    - Add a Watcher -
    - -
    - + - - + +
    @@ -665,119 +839,47 @@ if (isset($_GET['ticket_id'])) { - - -
    -
    Details
    -
    - -
    -
    - Created: -
    -
    - Updated: -
    - - - -
    - Closed by: -
    -
    - Feedback: -
    - - - - -
    - Scheduled: -
    - -
    - Total time worked: -
    - -
    - Billable: - - $"; - } else { - echo "X"; - } - ?> - -
    - -
    - - - -
    -
    Asset
    - - - -
    - Add an Asset -
    - - - + +
    +
    Asset
    - +
    - +
    - +
    - Model: + Model:
    - Service Tag: + Service Tag:
    - Warranty expires: + Warranty expires:
    - + Access
    - - - - -
    + +
    + -
    -
    Vendor
    - -
    - Add a Vendor -
    - + +
    +
    Vendor
    +
    - +
    - +
    - +
    - +
    - +
    - +
    - - -
    - - - - -
    - - -
    - -
    -
    - -
    - -
    - -
    -
    +
    -
    - - - - -
    - - - Invoice Ticket - - - - Close Ticket - - -
    + +
    @@ -955,6 +998,8 @@ if (isset($_GET['ticket_id'])) { require_once "ticket_merge_modal.php"; + require_once "task_add_modal.php"; + if ($config_module_enable_accounting) { require_once "ticket_edit_billable_modal.php"; require_once "ticket_invoice_add_modal.php"; diff --git a/ticket_add_modal.php b/ticket_add_modal.php index f5bac066..0ee8c3b0 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -27,6 +27,12 @@
  • Vendor
    • +
  • + Tasks +
    • +
  • + Project +
    • @@ -188,7 +194,7 @@
    +
    + +
    +
    +
    + +

    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php index 19104829..6404661c 100644 --- a/ticket_edit_modal.php +++ b/ticket_edit_modal.php @@ -29,6 +29,9 @@
  • Vendor
    • +
  • + Project +
    • @@ -222,6 +225,31 @@
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    diff --git a/tickets.php b/tickets.php index cad4d9ee..e0ead524 100644 --- a/tickets.php +++ b/tickets.php @@ -331,6 +331,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); } else { $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; } + $project_id = intval($row['ticket_project_id']); $client_id = intval($row['ticket_client_id']); @@ -368,7 +369,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); // Get who last updated the ticket - to be shown in the last Response column $ticket_reply_type = "Client"; // Default to client for unreplied tickets $ticket_reply_by_display = ""; // Default none - $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, ticket_reply_created_at, contact_name, user_name FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id @@ -379,12 +380,13 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); if ($row) { $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); - if ($ticket_reply_type == "Client") { $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); } else { $ticket_reply_by_display = nullable_htmlentities($row['user_name']); } + $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); + $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); } ?> @@ -450,13 +452,13 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); -
    +
    - +