From 163a3c085b87128c49a09fb985cda01e1aa4f369 Mon Sep 17 00:00:00 2001
From: Jannis Klose <69921578+janni1288@users.noreply.github.com>
Date: Sat, 25 Jul 2026 18:48:51 +0200
Subject: [PATCH] fix(labels): correct entity label to use entity data instead
 of stale waypoint/order fallbacks

---
 server/resources/views/labels/entity-label.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/resources/views/labels/entity-label.php b/server/resources/views/labels/entity-label.php
index 98bf6e63d..ac62da5f7 100644
--- a/server/resources/views/labels/entity-label.php
+++ b/server/resources/views/labels/entity-label.php
@@ -8,7 +8,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title><?= $company->name ?? ($waypoint->internal_id ?? $waypoint->public_id) ?> Waypoint Label</title>
+    <title><?= $company->name ?? ($entity->internal_id ?? $entity->public_id) ?> Item Label</title>
 </head>
 
 <style>
@@ -45,7 +45,7 @@
     <div style="width: 420px; border: 2px #414141 solid; margin: auto;">
         <div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
             <div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
-                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
+                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $entity->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
             </div>
             <div style="margin-top: 10px;">
                 <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></span>
@@ -114,8 +114,8 @@
         <?php } ?>
         <div class="group">
             <div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
-                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode ?>" style="height: 90px; margin-top: 10px;">
-                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number) ?></div>
+                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $entity->barcode ?>" style="height: 90px; margin-top: 10px;">
+                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $entity->public_id) ?></div>
             </div>
         </div>
     </div>
