From 77b72507037d59e9a8450cd482e0533014600ef3 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Thu, 12 Sep 2024 15:04:52 +0100 Subject: [PATCH] Adjust ticket reply layout --- ticket.php | 534 +++++++++++++++++++++++------------------------ user_details.php | 2 +- 2 files changed, 267 insertions(+), 269 deletions(-) diff --git a/ticket.php b/ticket.php index e78dd08b0..61dd3f9e7 100644 --- a/ticket.php +++ b/ticket.php @@ -331,7 +331,7 @@ // The user names in a comma-separated string $ticket_collaborators = nullable_htmlentities($row['user_names']); -?> + ?>
    @@ -362,70 +362,70 @@
    - - Invoice - + + Invoice + - - - Reopen - -   - - - - - Resolve - - - - - - Close - - - -
    - -
    - - Edit - - - Merge - - -
    - - Add Contact - - - Add Asset + + + Reopen - - Add Vendor - - - Add Watcher +   + + + + + Resolve - -
    - - Change Client + + + + + Close - + + +
    + +
    + + Edit + + + Merge + + +
    + + Add Contact + + + Add Asset + + + Add Vendor + + + Add Watcher + +
    - - Delete + + Change Client - + +
    + + Delete + + +
    -
    @@ -453,7 +453,7 @@ $row = mysqli_fetch_array($sql_closed_by); $ticket_closed_by_display = nullable_htmlentities($row['user_name']); } - ?> + ?>
    Closed by:
    @@ -464,9 +464,9 @@ -
    - Feedback: -
    +
    + Feedback: +
    @@ -493,32 +493,32 @@ // Billable if ($config_module_enable_accounting) { ?> -
    - Invoiced: -
    +
    + Invoiced: +
    -
    - Ticket is - - Billable"; - } else { - echo "Not Billable"; - } - ?> - -
    +
    + Ticket is + + Billable"; + } else { + echo "Not Billable"; + } + ?> + +
    - Tasks Completed% -
    -
    /
    -
    + Tasks Completed% +
    +
    /
    +
    -
    - -
    +
    + +
    0) { ?> @@ -560,13 +560,13 @@

    - Ticket Details + Ticket Details

    - Subject: + Subject:

    @@ -589,92 +589,92 @@
    -
    - - - -
    -
    - - - + + + + +
    +
    + + + +
    -
    -
    - -
    +
    + +
    -
    -
    -
    - - - + + - + - - + + +
    -
    - -
    -
    -
    - -
    + +
    +
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - - +
    + + +
    -
    -
    -
    - - - - - +
    +
    + + + + + +
    -
    -
    +
    - -
    + +
    -
    Responses
    +
    Responses:
    + ?> -
    mb-3"> + +
    mb-3">
    -

    -
    +
    + +
    User Avatar @@ -730,50 +727,49 @@ -
    - +
    +

    - -
    - -
    - -
    - modified: + +
    +
    Time worked:
    - -     +
    - -
    - Time worked: -
    -
    -

    - -
    -
    - -
    - - Edit - - -
    - - Archive - - + +
    + +
    +
    + +
    + + Edit + + +
    + + Archive + + +
    +
    -
    -
    - + + + +
    + +
    +     +
    +
    @@ -787,10 +783,12 @@ } ?>
    -
    - + + + -
    -
    Contact
    -
    - - -
    +
    +
    Contact
    +
    + + +
    - -
    - -
    - +
    + +
    + -
    - -
    - +
    + +
    + -
    - -
    - +
    + +
    + -
    - -
    - + if (!empty($contact_mobile)) { ?> +
    + +
    + - $ticket_id ORDER BY ticket_id DESC LIMIT 1"; - $prev_ticket_row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket)); + $sql_prev_ticket = "SELECT ticket_id, ticket_created_at, ticket_subject, ticket_status, ticket_assigned_to FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_id <> $ticket_id ORDER BY ticket_id DESC LIMIT 1"; + $prev_ticket_row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket)); - if ($prev_ticket_row) { - $prev_ticket_id = intval($prev_ticket_row['ticket_id']); - $prev_ticket_subject = nullable_htmlentities($prev_ticket_row['ticket_subject']); - $prev_ticket_status = nullable_htmlentities( getTicketStatusName($prev_ticket_row['ticket_status'])); - ?> + if ($prev_ticket_row) { + $prev_ticket_id = intval($prev_ticket_row['ticket_id']); + $prev_ticket_subject = nullable_htmlentities($prev_ticket_row['ticket_subject']); + $prev_ticket_status = nullable_htmlentities( getTicketStatusName($prev_ticket_row['ticket_status'])); + ?> -
    -
    - Previous ticket: - -
    -
    - Status: - -
    - +
    +
    + Previous ticket: + +
    +
    + Status: + +
    + -
    +
    @@ -893,15 +891,15 @@ $task_order = intval($row['task_order']); //$task_description = nullable_htmlentities($row['task_description']); // not in db yet $task_completed_at = nullable_htmlentities($row['task_completed_at']); - ?> + ?> - + - - - + + + @@ -932,10 +930,10 @@ - + require "task_edit_modal.php"; + } ?>
    @@ -962,13 +960,13 @@
    - +
    - +
    Asset
    @@ -1036,12 +1034,12 @@ $service_ticket_status = nullable_htmlentities($row['ticket_status']); $service_ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $service_ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); - ?> + ?>

    Ticket: $service_ticket_subject ($service_ticket_status)"; ?>

    -
    @@ -1105,19 +1103,19 @@ -
    -
    Project
    -
    - - -
    +
    +
    Project
    +
    + + +
    - -
    - + +
    + +
    +
    - -
    @@ -1125,7 +1123,7 @@
    - - User avatar" class="img-fluid"> + User avatar" class="img-size-64">