From a5c7b8f609334a657615ed1b94dc23b5c393b7c4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 11 Nov 2025 13:17:56 +0000
Subject: [PATCH] Small unaccepted items report fixes

---
 app/Console/Commands/SendAcceptanceReminder.php | 2 +-
 app/Http/Controllers/ReportsController.php      | 2 +-
 app/Models/Checkoutable.php                     | 2 +-
 resources/lang/en-US/general.php                | 2 +-
 resources/lang/en-US/mail.php                   | 2 +-
 tests/Unit/Mail/CheckoutAssetMailTest.php       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Console/Commands/SendAcceptanceReminder.php b/app/Console/Commands/SendAcceptanceReminder.php
index 4eb4a5114f..172a88f104 100644
--- a/app/Console/Commands/SendAcceptanceReminder.php
+++ b/app/Console/Commands/SendAcceptanceReminder.php
@@ -31,7 +31,7 @@ class SendAcceptanceReminder extends Command
      *
      * @var string
      */
-    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
+    protected $description = 'This will resend users with unaccepted items a reminder to accept or decline them.';
 
     /**
      * Create a new command instance.
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 73fcbef334..55fa5431d9 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -1180,7 +1180,7 @@ class ReportsController extends Controller
         $acceptance = $query->find($id);
         if (!$acceptance) {
             Log::debug('No pending acceptances');
-            // Redirect to the unaccepted assets report page with error
+            // Redirect to the unaccepted items report page with error
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
         }
         $item      = $acceptance->checkoutable;
diff --git a/app/Models/Checkoutable.php b/app/Models/Checkoutable.php
index 9bf091c15f..04a1806f98 100644
--- a/app/Models/Checkoutable.php
+++ b/app/Models/Checkoutable.php
@@ -26,7 +26,7 @@ class Checkoutable
         $acceptance = $unaccepted;
 
         $assignee = $acceptance->assignedTo;
-        $company = optional($unaccepted_row->company)->present()?->nameUrl() ?? '';
+        $company = $unaccepted_row->company ? optional($unaccepted_row->company)->present()->nameUrl() : '';
         $category = $model = $name = $tag = '';
         $type = $acceptance->checkoutable_item_type ?? '';
 
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index d71ac4fcef..a33207537d 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -327,7 +327,7 @@ return [
     'declined'			    => 'declined',
     'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'unaccepted_asset_report' => 'Unaccepted Items',
     'users'                 => 'Users',
     'viewall'				=> 'View All',
     'viewassets'  			=> 'View Assigned Items',
diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.php
index 1fd02d5c07..f9e9b38cba 100644
--- a/resources/lang/en-US/mail.php
+++ b/resources/lang/en-US/mail.php
@@ -104,7 +104,7 @@ return [
     'upcoming-audits_click' => 'This email may not contain the full list so as not to exceed email size limits. Click on the button below to view all assets due for audit.',
     'user' => 'User',
     'username' => 'Username',
-    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Items',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
diff --git a/tests/Unit/Mail/CheckoutAssetMailTest.php b/tests/Unit/Mail/CheckoutAssetMailTest.php
index f2e5b34b53..6ee2d937a8 100644
--- a/tests/Unit/Mail/CheckoutAssetMailTest.php
+++ b/tests/Unit/Mail/CheckoutAssetMailTest.php
@@ -45,7 +45,7 @@ class CheckoutAssetMailTest extends TestCase
                     'asset' => Asset::factory()->requiresAcceptance()->create(),
                     'acceptance' => CheckoutAcceptance::factory()->create(),
                     'first_time_sending' => false,
-                    'expected_subject' => 'Reminder: You have Unaccepted Assets.',
+                    'expected_subject' => 'Reminder: You have Unaccepted Items',
                     'expected_opening' => 'An item was recently checked out under your name that requires acceptance, details are below.'
                 ];
             }