Fix SQL query and update table layout

Author: HashJProgramming

functions/proceed-transaction.php

@@ -31,7 +31,7 @@
     exit();
 }
 
-$sql = 'SELECT l.id, p.price AS price
+$sql = 'SELECT l.id, l.kilo, p.price AS price
         FROM laundry AS l
         JOIN transactions AS t ON l.transaction_id = t.id
         JOIN prices AS p ON l.type = p.id
@@ -43,7 +43,7 @@
 
 $total_price = 0;
 foreach ($results as $row) {
-    $total_price += $row['price'];
+    $total_price += $row['price'] * $row['kilo'];
 }
 
 echo $total_price;

functions/views/customers.php

@@ -14,7 +14,7 @@
 $lastname = $fullname[1];
 ?>
     <tr>
-        <td>#<?php echo $row['id']; ?></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['address']; ?></td>
         <td><?php echo $row['contact']; ?></td>

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>';

functions/views/staff.php

@@ -13,7 +13,7 @@
 
     ?>
         <tr>
-            <td>#<?php echo $row['id']; ?></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['username']; ?></td>
             <td><?php echo $row['created_at']; ?></td>
             <td class="text-center">

functions/views/supply.php

@@ -11,7 +11,7 @@
 
 ?>
     <tr>
-        <td>#<?php echo $row['id']; ?></td>
+        <td><?php echo $row['id']; ?></td>
         <td><?php echo $row['name']; ?></td>
         <td><?php echo $row['unit']; ?></td>
         <td><?php echo $row['stock']; ?></td>

sales.php

@@ -107,7 +107,6 @@
     <script src="assets/js/vfs_fonts.js"></script>
     <script src="assets/js/buttons.html5.min.js"></script>
     <script src="assets/js/buttons.print.min.js"></script>
-    <script src="assets/js/listTable.js"></script>
     <script src="assets/js/theme.js"></script>
     <script src="assets/js/sweetalert.min.js"></script>
     <script>
@@ -119,7 +118,19 @@
         } else if (type == 'error') {
             swal("Error!", message, "error");
         }
-        
+        $(document).ready(function() {
+            $('#dataTable').DataTable( {
+                dom: 'Blfrtip',
+                aaSorting: [[0, 'desc']],
+                buttons: [
+                    { extend: 'excel', className: 'btn btn-primary' },
+                    { extend: 'pdf', className: 'btn btn-primary' },
+                    { extend: 'print', className: 'btn btn-primary' }
+                ]
+            } );
+            
+            
+        } );
     </script>
 </body>
 

tracking.php

@@ -74,9 +74,9 @@
                             ?>
                                 <div class="d-flex justify-content-between align-items-center mb-5">
                                     <div>
-                                        <h2 class="mb-0">Queue <span class="text-primary font-weight-bold">#<?php echo $queue_number; ?></span></h2>
-                                        <h4 class="mb-0">Type - <span class="text-primary font-weight-bold"><?php echo $row['name']; ?></span></h4>
-                                        <h4 class="mb-0">Load - <span class="text-primary font-weight-bold"><?php echo $row['kilo']; ?>kg</span></h4>
+                                        <h2 class="mb-2">Queue <span class="text-primary font-weight-bold">#<?php echo $queue_number; ?></span></h2>
+                                        <h5 class="mb-0 ms-5 font-monospace">Type - <span class="text-primary font-weight-bold"><?php echo $row['name']; ?></span></h5>
+                                        <h5 class="mb-0 ms-5 font-monospace">Load - <span class="text-primary font-weight-bold"><?php echo $row['kilo']; ?>kg</span></h5>
                                     </div>
                                 </div>
                                 <div class="progress d-flex justify-content-between d-flex justify-content-between mx-0 mt-0 mb-5">