From 24bb6793053fb01748eb317fb2bbfe0750e0ef99 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 12:24:22 -0800
Subject: [PATCH 1/3] adds check that asset has asset status before checking
 archived

---
 app/Notifications/CheckinAssetNotification.php | 2 +-
 resources/views/locations/print.blade.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index fa4780c1fd..0242981173 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -143,7 +143,7 @@ class CheckinAssetNotification extends Notification
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
                                 $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index 9f54978ff5..a047f02279 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -126,7 +126,7 @@
     	
     	@foreach ($assets as $asset)
             @php
-                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){
+                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
                     continue;
                 }
             @endphp

From 6bb0927f262b19d2f0126c6d0cf464d457b66bc2 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 12:30:21 -0800
Subject: [PATCH 2/3] remove unrelated change

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

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 0242981173..fa4780c1fd 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -143,7 +143,7 @@ class CheckinAssetNotification extends Notification
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
                                 $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
+                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )

From f46ad4811e906fbbf64cd8f070858eaef1182bea Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 16:44:09 -0800
Subject: [PATCH 3/3] Migrate form email helper on user setup page

---
 resources/views/setup/user.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index 18da69513e..a6a01782a1 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -125,7 +125,7 @@
       <!-- email-->
       <div class="form-group col-lg-6{{ $errors->has('email') ? 'error' : '' }}">
         {{ Form::label('email', trans('admin/users/table.email')) }}
-        {{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com', 'required' => true)) }}
+        <input class="form-control" type="email" name="email" id="email" value="{{ old('email', config('mail.from.address')) }}" placeholder="you@example.com" required>
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>