From d57f56e44f99d0ff98db31368a05bb87a5b4ff4f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 8 May 2025 16:20:26 -0700
Subject: [PATCH 1/3] Handle settings not being available

---
 app/Models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index a115852d5c..9b211e6a04 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -320,7 +320,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         $setting = Setting::getSettings();
 
-        if ($setting->name_display_format=='last_first') {
+        if ($setting?->name_display_format == 'last_first') {
             return ($this->last_name) ? $this->last_name.' '.$this->first_name : $this->first_name;
         }
         return $this->last_name ? $this->first_name.' '.$this->last_name : $this->first_name;

From e2772c816df20e878c773ef2dd4928bb573d8dd9 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 12 May 2025 13:58:13 -0700
Subject: [PATCH 2/3] Remove label logo outline from L7162_B label

---
 app/Models/Labels/Sheets/Avery/L7162_B.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Labels/Sheets/Avery/L7162_B.php b/app/Models/Labels/Sheets/Avery/L7162_B.php
index 268754e04f..9f24d58c2f 100644
--- a/app/Models/Labels/Sheets/Avery/L7162_B.php
+++ b/app/Models/Labels/Sheets/Avery/L7162_B.php
@@ -55,7 +55,7 @@ class L7162_B extends L7162
                 $pdf, $record->get('logo'),
                 $pa->x1, $pa->y1,
                 self::LOGO_MAX_WIDTH, $usableHeight,
-                'L', 'T', 300, true, false, 0.1
+                'L', 'T', 300, true, false, 0
             );
             $currentX += $logoSize[0] + self::LOGO_MARGIN;
             $usableWidth -= $logoSize[0] + self::LOGO_MARGIN;
@@ -100,4 +100,4 @@ class L7162_B extends L7162
 }
 
 
-?>
\ No newline at end of file
+?>

From 6b56929a069aa4370613c4ca9e2aff3fc4012d5d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 13 May 2025 20:44:25 +0200
Subject: [PATCH 3/3] Null operator for missing created_by record

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index e4af3d6e78..313bf765ee 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -324,7 +324,7 @@
                   </strong>
               </div>
               <div class="col-md-9" style="word-wrap: break-word;">
-                  {{ $accessory->adminuser->present()->fullName() }}
+                  {{ $accessory->adminuser?->present()->fullName() }}
               </div>
           </div>