Refactor queue and sales views

Author: HashJProgramming

functions/views/queue-dashboard.php

@@ -28,10 +28,9 @@
     ?>
         <tr>
             <td><?php echo $row['queue_number']; ?></td>
+            <td>#<?php echo $row['id']; ?></td>
             <td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/profile.png"><?php echo $row['fullname']; ?></td>
-            <td><?php echo $row['id']; ?></td>
             <td><?php echo $row['kilo']; ?></td>
-            <td>₱<?php echo number_format($row['total'] , 2); ?></td>
             <td><?php echo $status ?></td>
             <td><?php echo $row['created_at']; ?></td>
         </tr>

functions/views/queue.php

@@ -1,7 +1,8 @@
 <?php
 include_once 'functions/connection.php';
-$sql = 'SELECT l.status, l.id AS laundry_id, l.kilo, t.id, t.customer_id, t.total, l.created_at, c.fullname, ROW_NUMBER() OVER (ORDER BY status DESC, kilo ASC) AS queue_number 
+$sql = 'SELECT l.status, l.id AS laundry_id, l.kilo, p.price, p.name, t.id, t.customer_id, t.total, l.created_at, c.fullname, ROW_NUMBER() OVER (ORDER BY status DESC, kilo ASC) AS queue_number 
         FROM laundry AS l
+        JOIN prices AS p ON l.type = p.id
         JOIN transactions AS t ON l.transaction_id = t.id
         JOIN customers AS c ON t.customer_id = c.id
         WHERE l.status > 0 AND l.status < 4';
@@ -28,10 +29,11 @@
     ?>
         <tr>
             <td><?php echo $row['queue_number']; ?></td>
+            <td>#<?php echo $row['id']; ?></td>
             <td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/profile.png"><?php echo $row['fullname']; ?></td>
-            <td><?php echo $row['id']; ?></td>
             <td><?php echo $row['kilo']; ?></td>
-            <td>₱<?php echo number_format($row['total'], 2); ?></td>
+            <td><?php echo $row['name']; ?> - ₱<?php echo number_format($row['price'], 2)?></td>
+            <td>₱<?php echo number_format($row['price'] * $row['kilo'], 2); ?></td>
             <td><?php echo $status ?></td>
             <td><?php echo $row['created_at']; ?></td>
             <td class="text-center">

functions/views/sales.php

@@ -28,7 +28,7 @@
     }
 
     echo '<tr>';
-    echo '<td>' . $row['id'] . '</td>';
+    echo '<td>#' . $row['id'] . '</td>';
     echo '<td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/profile.png">' . $row['fullname'] . '</td>';
     echo '<td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/profile.png">' . $row['username'] . '</td>';
     echo '<td>' . $row['kilo'] . '</td>';

index.php

@@ -220,10 +220,9 @@
                                             <thead>
                                             <tr>
                                                 <th>Queue </th>
+                                                <th>Invoice</th>
                                                 <th>Customer</th>
-                                                <th>Transaction ID</th>
                                                 <th>Kg/Kilo</th>
-                                                <th>Total</th>
                                                 <th>Status</th>
                                                 <th>Date</th>
                                             </tr>

queue.php

@@ -60,9 +60,10 @@
                                     <thead>
                                         <tr>
                                             <th>Queue </th>
+                                            <th>Invoice</th>
                                             <th>Customer</th>
-                                            <th>Transaction ID</th>
                                             <th>Kg/Kilo</th>
+                                            <th>Type & Price</th>
                                             <th>Total</th>
                                             <th>Status</th>
                                             <th>Date</th>
@@ -189,21 +190,21 @@
                         extend: 'excel',
                         className: 'btn btn-primary',
                         exportOptions: {
-                            columns: [0, 1, 2, 3, 4, 5, 6]
+                            columns: [0, 1, 2, 3, 4, 5, 7]
                         }
                     },
                     {
                         extend: 'pdf',
                         className: 'btn btn-primary',
                         exportOptions: {
-                            columns: [0, 1, 2, 3, 4, 5, 6]
+                            columns: [0, 1, 2, 3, 4, 5, 7]
                         }
                     },
                     {
                         extend: 'print',
                         className: 'btn btn-primary',
                         exportOptions: {
-                            columns: [0, 1, 2, 3, 4, 5, 6]
+                            columns: [0, 1, 2, 3, 4, 5, 7]
                         }
                     }
                 ]

sales.php

@@ -60,7 +60,7 @@
                                 <table class="table table-striped my-0" id="dataTable">
                                     <thead>
                                         <tr>
-                                            <th>Transaction ID</th>
+                                            <th>Invoice</th>
                                             <th>Customer</th>
                                             <th>User</th>
                                             <th>KG/Kilo</th>