7 Feb 2024

1) Added "item sort order" to delivery items table.
2) Updated report and delivery library to adapt sort order.

Author: code-boxx

lib/LIB-Delivery.php

@@ -39,13 +39,14 @@ function save ($name, $tel, $email, $address, $date, $items, $notes=null, $stat=
 
     // (A4) ADD ITEMS
     $items = json_decode($items, true);
-    $data = []; $sku = [];
+    $data = []; $sku = []; $n = 0;
     foreach ($items as $i) {
-      $data = array_merge($data, [$id], $i);
+      $data = array_merge($data, [$id, $n], $i);
       $sku[] = "\"$i[0]\"";
+      $n++;
     }
     $this->DB->insert("deliveries_items",
-      ["d_id", "item_sku", "item_price", "item_qty"],
+      ["d_id", "item_sort", "item_sku", "item_price", "item_qty"],
       $data
     );
 
@@ -103,7 +104,8 @@ function get ($id) {
       "SELECT d.`item_sku` s, i.`item_name` n, i.`item_unit` u, d.`item_price` p, d.`item_qty` q
        FROM `deliveries_items` d
        LEFT JOIN `items` i USING (`item_sku`)
-       WHERE `d_id`=?", [$id]
+       WHERE `d_id`=?
+       ORDER BY `item_sort`", [$id]
     );
     $d["items"] = [];
     while ($r = $this->DB->stmt->fetch(PDO::FETCH_NUM)) {

lib/LIB-Report.php

@@ -175,12 +175,8 @@ function getMonitor () {
   // (G) DELIVERY ORDER
   function deliver ($id) {
     $this->Settings->defineN("DELIVER_STAT", true);
-    $order = $this->DB->fetch("SELECT * FROM `deliveries` WHERE `d_id`=?", [$id]);
-    $items = $this->DB->fetchAll(
-      "SELECT d.`item_sku`, d.`item_price`, d.`item_qty`, i.`item_unit`, i.`item_name`
-      FROM `deliveries_items` d
-      LEFT JOIN `items` i USING (`item_sku`)
-      WHERE `d_id`=?", [$id]);
+    $this->Core->load("Delivery");
+    $order = $this->Delivery->get($id);
     $this->htop([
       ["l", HOST_ASSETS."REPORT-deliver.css"]
     ]);

lib/SQL-Storage-Boxx-0.sql

@@ -169,8 +169,10 @@ CREATE TABLE `deliveries_items` (
   `d_id` bigint(20) NOT NULL,
   `item_sku` varchar(255) NOT NULL,
   `item_price` decimal(12,2) NOT NULL DEFAULT 0.00,
-  `item_qty` decimal(12,2) NOT NULL
+  `item_qty` decimal(12,2) NOT NULL,
+  `item_sort` bigint(20) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 ALTER TABLE `deliveries_items`
-  ADD PRIMARY KEY (`d_id`,`item_sku`);
+  ADD PRIMARY KEY (`d_id`,`item_sku`),
+  ADD KEY `item_sort` (`item_sort`);

pages/REPORT-deliver.php

@@ -38,12 +38,12 @@
     <th>Unit Price</th>
     <th>Amount</th>
   </tr></thead>
-  <tbody><?php foreach ($items as $i) { ?>
+  <tbody><?php foreach ($order["items"] as $i) { ?>
   <tr>
-    <td><?=$i["item_qty"]?> <?=$i["item_unit"]?></td>
-    <td>[<?=$i["item_sku"]?>] <?=$i["item_name"]?></td>
-    <td><?=$i["item_price"]?></td>
-    <td><?=$i["item_price"]?></td>
+    <td><?=$i[3]?> <?=$i[2]?></td>
+    <td>[<?=$i[0]?>] <?=$i[1]?></td>
+    <td><?=$i[4]?></td>
+    <td><?=$i[3] * $i[4]?></td>
   </tr>
   <?php } ?></tbody>
 </table>