From 24cc593162e9afee55ff57a7e54fb515299b4ab5 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Tue, 10 Sep 2024 19:13:13 +0100 Subject: [PATCH 1/2] Add resolved date to ticket export csv --- post/ticket.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/post/ticket.php b/post/ticket.php index 542fc5bc..cf141a5b 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1736,7 +1736,13 @@ if (isset($_POST['export_client_tickets_csv'])) { $client_name = $row['client_name']; - $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id ORDER BY ticket_number ASC"); + $sql = mysqli_query( + $mysqli, + "SELECT * FROM tickets + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_client_id = $client_id ORDER BY ticket_number ASC" + ); + if ($sql->num_rows > 0) { $delimiter = ","; $filename = $client_name . "-Tickets-" . date('Y-m-d') . ".csv"; @@ -1745,12 +1751,12 @@ if (isset($_POST['export_client_tickets_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Ticket Number', 'Priority', 'Status', 'Subject', 'Date Opened', 'Date Closed'); + $fields = array('Ticket Number', 'Priority', 'Status', 'Subject', 'Date Opened', 'Date Resolved', 'Date Closed'); 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['ticket_number'], $row['ticket_priority'], $row['ticket_status'], $row['ticket_subject'], $row['ticket_created_at'], $row['ticket_closed_at']); + $lineData = array($config_ticket_prefix . $row['ticket_number'], $row['ticket_priority'], $row['ticket_status_name'], $row['ticket_subject'], $row['ticket_created_at'], $row['ticket_resolved_at'], $row['ticket_closed_at']); fputcsv($f, $lineData, $delimiter); } From ce1fc0446898796aec9d2c0516b67c1cd04f81b6 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Tue, 10 Sep 2024 19:14:47 +0100 Subject: [PATCH 2/2] Add resolved date to ticket export csv --- post/ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/post/ticket.php b/post/ticket.php index cf141a5b..f9260bd8 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1738,8 +1738,8 @@ if (isset($_POST['export_client_tickets_csv'])) { $sql = mysqli_query( $mysqli, - "SELECT * FROM tickets - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + "SELECT * FROM tickets + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_client_id = $client_id ORDER BY ticket_number ASC" );