Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Console/Commands/SendAcceptanceReminder.php

@@ -64,6 +64,7 @@ public function handle()
             ->groupBy(function($item) {
                 return $item['acceptance']->assignedTo ? $item['acceptance']->assignedTo->id : '';
             });
+            $no_email_list= [];
 
         foreach($unacceptedAssetGroups as $unacceptedAssetGroup) {
             // The [0] is weird, but it allows for the item_count to work and grabs the appropriate info for each user.
@@ -72,7 +73,10 @@ public function handle()
             $locale = $acceptance->assignedTo?->locale;
             $email = $acceptance->assignedTo?->email;
             if(!$email){
-                $this->info($acceptance->assignedTo?->present()->fullName().' has no email address.');
+                $no_email_list[] = [
+                    'id' => $acceptance->assignedTo->id,
+                    'name' => $acceptance->assignedTo->present()->fullName(),
+                ];
             }
             $item_count = $unacceptedAssetGroup->count();
 
@@ -86,6 +90,14 @@ public function handle()
         }
 
         $this->info($count.' users notified.');
+        $headers = ['ID', 'Name'];
+        $rows = [];
+
+        foreach ($no_email_list as $user) {
+            $rows[] = [$user['id'], $user['name']];
+        }
+        $this->info("The following users do not have an email address:");
+        $this->table($headers, $rows);
 
         return 0;
     }

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -358,15 +358,19 @@ public function update(Request $request) : RedirectResponse
                  * to someone/something.
                  */
                 if ($request->filled('status_id')) {
-                    $updated_status = Statuslabel::find($request->input('status_id'));
+                    try {
+                        $updated_status = Statuslabel::findOrFail($request->input('status_id'));
+                    } catch (ModelNotFoundException $e) {
+                        return redirect($bulk_back_url)->with('error', trans('admin/statuslabels/message.does_not_exist'));
+                    }
 
                     // We cannot assign a non-deployable status type if the asset is already assigned.
                     // This could probably be added to a form request.
                     // If the asset isn't assigned, we don't care what the status is.
                     // Otherwise we need to make sure the status type is still a deployable one.
                     if (
                         ($asset->assigned_to == '')
-                        || ($updated_status->deployable == '1') && ($asset->assetstatus->deployable == '1')
+                        || ($updated_status->deployable == '1') && ($asset->assetstatus?->deployable == '1')
                     ) {
                         $this->update_array['status_id'] = $updated_status->id;
                     }

tests/Feature/Console/SendAcceptanceReminderTest.php

@@ -43,9 +43,13 @@ public function testAcceptanceReminderCommandHandlesUserWithoutEmail()
         CheckoutAcceptance::factory()->pending()->create([
             'assigned_to_id' => $userA->id,
         ]);
-
+        $headers = ['ID', 'Name'];
+        $rows = [
+            [$userA->id, $userA->present()->fullName()],
+        ];
         $this->artisan('snipeit:acceptance-reminder')
-            ->expectsOutput($userA->present()->fullName().' has no email address.')
+            ->expectsOutput("The following users do not have an email address:")
+            ->expectsTable($headers, $rows)
             ->assertExitCode(0);
 
         Mail::assertNotSent(UnacceptedAssetReminderMail::class);