From b6e2f5ea5b7ca68e97c969f0ad9a134946377d07 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Sat, 24 Feb 2024 14:39:51 +0200 Subject: [PATCH] Support system UI improvements --- cp/app/Controllers/SupportController.php | 13 +- .../views/admin/support/viewTicket.twig | 191 +++++++++++++----- 2 files changed, 146 insertions(+), 58 deletions(-) diff --git a/cp/app/Controllers/SupportController.php b/cp/app/Controllers/SupportController.php index 2a7c3a7..813e408 100644 --- a/cp/app/Controllers/SupportController.php +++ b/cp/app/Controllers/SupportController.php @@ -118,29 +118,30 @@ class SupportController extends Controller if ($ticket_owner != $clid && $_SESSION["auth_roles"] != 0) { return $response->withHeader('Location', '/support')->withStatus(302); } - + // Get the current URI $uri = $request->getUri()->getPath(); - $ticket = $db->selectRow('SELECT st.*, u.username AS ticket_creator + $ticket = $db->selectRow('SELECT st.*, u.username AS ticket_creator, st.user_id FROM support_tickets AS st JOIN users AS u ON st.user_id = u.id WHERE st.id = ?', [$ticketNumber]); if ($ticket) { - $replies = $db->select('SELECT tr.*, u.username AS responder_name + $replies = $db->select('SELECT tr.*, u.username AS responder_name, tr.responder_id FROM ticket_responses AS tr JOIN users AS u ON tr.responder_id = u.id WHERE tr.ticket_id = ? - ORDER BY tr.date_created DESC', [$ticketNumber]); + ORDER BY tr.date_created ASC', [$ticketNumber]); $category = $db->selectValue('SELECT name FROM ticket_categories WHERE id = ?', [$ticket['category_id']]); - + $_SESSION['current_ticket'] = [$ticket['id']]; return view($response,'admin/support/viewTicket.twig', [ 'ticket' => $ticket, 'replies' => $replies, 'category' => $category, - 'currentUri' => $uri + 'currentUri' => $uri, + 'user_id' => $_SESSION['auth_user_id'] ]); } else { $this->container->get('flash')->addMessage('error', 'Invalid ticket number'); diff --git a/cp/resources/views/admin/support/viewTicket.twig b/cp/resources/views/admin/support/viewTicket.twig index 769edc3..83261ca 100644 --- a/cp/resources/views/admin/support/viewTicket.twig +++ b/cp/resources/views/admin/support/viewTicket.twig @@ -29,18 +29,7 @@ {{ csrf.field | raw }}
-

{{ __('Ticket') }} #{{ ticket.id }} - {{ ticket.subject }}

  - {% if ticket.status == 'Open' %} - {{ ticket.status }} - {% elseif ticket.status == 'In Progress' %} - {{ ticket.status }} - {% elseif ticket.status == 'Resolved' %} - {{ ticket.status }} - {% elseif ticket.status == 'Closed' %} - {{ ticket.status }} - {% else %} - {{ __('Unknown Status') }} - {% endif %} +

{{ __('Ticket') }} #{{ ticket.id }} - {{ ticket.subject }}

{% if ticket.status != 'Closed' %}