Merge remote-tracking branch 'origin/develop'

Author: snipe

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.

app/Http/Controllers/ReportsController.php

@@ -1180,7 +1180,7 @@ public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
         $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;

app/Models/Checkoutable.php

@@ -26,7 +26,7 @@ public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
         $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 ?? '';
 

resources/lang/en-US/general.php

@@ -327,7 +327,7 @@
     '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',

resources/lang/en-US/mail.php

@@ -104,7 +104,7 @@
     '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',

tests/Unit/Mail/CheckoutAssetMailTest.php

@@ -45,7 +45,7 @@ function () {
                     '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.'
                 ];
             }