From 441591d39e294fd3c96d1e89de05d8af7e42ebd2 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Tue, 29 Mar 2022 21:16:02 +0100
Subject: [PATCH] Allow client to close ticket from portal

---
 portal/index.php           |  2 +-
 portal/ticket.php          | 30 ++++--------------------------
 portal/ticket_view_all.php |  2 ++
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/portal/index.php b/portal/index.php
index e38f42ff..9f2a3638 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -89,7 +89,7 @@ $total_tickets = $row['total_tickets'];
             <?php
             while($ticket = mysqli_fetch_array($contact_tickets)){
               echo "<tr>";
-              echo "<td> <a href='ticket.php?id=$ticket[ticket_id]'> $ticket[ticket_number]</a></td>";
+              echo "<td> <a href='ticket.php?id=$ticket[ticket_id]'> $ticket[ticket_prefix]$ticket[ticket_number]</a></td>";
               echo "<td> <a href='ticket.php?id=$ticket[ticket_id]'> $ticket[ticket_subject]</a></td>";
               echo "<td>$ticket[ticket_status]</td>";
               echo "</tr>";
diff --git a/portal/ticket.php b/portal/ticket.php
index 89d04fea..13bcfa56 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -23,34 +23,16 @@ if(isset($_GET['id']) && intval($_GET['id'])) {
     
   <nav class="navbar navbar-dark bg-dark">
     
-   <i class="fas fa-fw fa-ticket-alt text-secondary"></i> <a class="navbar-brand" href="#">Ticket number # <?php echo $ticket['ticket_prefix'], $ticket['ticket_number'] ?></a>
- 
-
+   <i class="fas fa-fw fa-ticket-alt text-secondary"></i> <a class="navbar-brand">Ticket <?php echo $ticket['ticket_prefix'], $ticket['ticket_number'] ?></a>
       
     <span class="navbar-text">
       <?php
-    if($ticket_status !== "Closed"){
-    ?>
-
-     
-   <button class="btn btn-sm btn-outline-success my-2 my-sm-0 form-inline my-2 my-lg-0" type="submit"><a href="post.php?close_ticket=<?php echo $ticket_id; ?>"><i class="fas fa-fw fa-check text-secondary text-success"></i>  Close ticket</a></button>
-
-    
-
-    
-    
-    <?php
-    }
-    ?>
+    if($ticket_status !== "Closed"){ ?>
+      <button class="btn btn-sm btn-outline-success my-2 my-sm-0 form-inline my-2 my-lg-0" type="submit"><a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>"><i class="fas fa-fw fa-check text-secondary text-success"></i>  Close ticket</a></button>
+    <?php } ?>
     </span>
   
   </nav>
-    
-    
-
-    
-
-    
 
     <div class="card">
       <div class="card-header">
@@ -66,9 +48,6 @@ if(isset($_GET['id']) && intval($_GET['id'])) {
       </div>
     </div>
 
-
-
-          
           
     <!-- Either show the reply comments box, ticket smiley feedback, or thanks for feedback -->
 
@@ -170,7 +149,6 @@ if(isset($_GET['id']) && intval($_GET['id'])) {
 
     ?>
 
-
     <?php
   }
   else{
diff --git a/portal/ticket_view_all.php b/portal/ticket_view_all.php
index 668d20c2..06f46e9c 100644
--- a/portal/ticket_view_all.php
+++ b/portal/ticket_view_all.php
@@ -46,6 +46,7 @@ $all_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN contacts O
   <table class="table">
     <thead>
     <tr>
+      <th scope="col">#</th>
       <th scope="col">Subject</th>
       <th scope="col">Contact</th>
       <th scope="col">Status</th>
@@ -56,6 +57,7 @@ $all_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN contacts O
     <?php
     while($ticket = mysqli_fetch_array($all_tickets)){
       echo "<tr>";
+        echo "<td> <a href='ticket.php?id=$ticket[ticket_id]'> $ticket[ticket_prefix]$ticket[ticket_id]</a></td>";
         echo "<td> <a href='ticket.php?id=$ticket[ticket_id]'> $ticket[ticket_subject]</a></td>";
         echo "<td>$ticket[contact_name]</td>";
         echo "<td>$ticket[ticket_status]</td>";