ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ticket-cleanup

Browse Source
This commit is contained in:
Johnny
2024-03-24 10:56:43 -04:00
committed by GitHub
parent ccb1bf9b0d 865c2dcb84
commit fe644317b6
3 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client_tickets.php
+1 -11
View File
@@ -159,17 +159,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']);
}
$ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
if ($ticket_status == "New") {
$ticket_status_color = "danger";
} elseif ($ticket_status == "Open") {
$ticket_status_color = "primary";
} elseif ($ticket_status == "On Hold") {
$ticket_status_color = "success";
} elseif ($ticket_status == "Auto Close") {
$ticket_status_color = "dark";
} elseif ($ticket_status == "Closed") {
$ticket_status_color = "dark";
}
$ticket_status_color = getTicketStatusColor($ticket_status);
if ($ticket_priority == "High") {
$ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
functions.php
+13
View File
@@ -1138,3 +1138,16 @@ function createiCalStrCancel($originaliCalStr) {
return $cal_event->export();
}
function getTicketStatusColor($ticket_status) {
if ($ticket_status == "New") {
return "danger";
} elseif ($ticket_status == "Open") {
return "primary";
} elseif ($ticket_status == "On Hold") {
return "success";
} elseif ($ticket_status == "Auto Close") {
return "dark";
} elseif ($ticket_status == "Closed") {
return "dark";
}
}
ticket.php
+2 -12
View File
@@ -77,17 +77,7 @@ if (isset($_GET['ticket_id'])) {
$ticket_feedback = nullable_htmlentities($row['ticket_feedback']);
$ticket_status = nullable_htmlentities($row['ticket_status']);
if ($ticket_status == "New") {
$ticket_status_display = "<span class='p-2 badge badge-danger'>$ticket_status</span>";
} elseif ($ticket_status == "Open") {
$ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
} elseif ($ticket_status == "On Hold") {
$ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
} elseif ($ticket_status == "Auto Close" || $ticket_status == "Closed") {
$ticket_status_display = "<span class='p-2 badge badge-dark'>$ticket_status</span>";
} else {
$ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>"; // To be removed
}
$ticket_status_color = getTicketStatusColor($ticket_status);
$ticket_vendor_ticket_number = nullable_htmlentities($row['ticket_vendor_ticket_number']);
$ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
@@ -262,7 +252,7 @@ if (isset($_GET['ticket_id'])) {
<div class="card card-body">
<div class="row">
<div class="col-9">
<h3><i class="fas fa-fw fa-life-ring text-secondary mr-2"></i>Ticket <?php echo "$ticket_prefix$ticket_number"; ?> <?php echo $ticket_status_display; ?></h3>
<h3><i class="fas fa-fw fa-life-ring text-secondary mr-2"></i>Ticket <?php echo "$ticket_prefix$ticket_number"; ?> <span class='p-2 badge badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status ?></span></h3>
</div>
<?php if ($ticket_status != "Closed") { ?>
<div class="col-3">