Skip to content

A free open source IT asset/license management system

Avoid error by pre-checking if user has email address

Marcus Moore2018407782ab
diff --git a/app/Listeners/CheckoutablesCheckedOutInBulkListener.php b/app/Listeners/CheckoutablesCheckedOutInBulkListener.php
index 2b141d86dd..59736a1084 100644
--- a/app/Listeners/CheckoutablesCheckedOutInBulkListener.php
+++ b/app/Listeners/CheckoutablesCheckedOutInBulkListener.php
@@ -7,6 +7,7 @@ use App\Mail\BulkAssetCheckoutMail;
use App\Models\Asset;
use App\Models\Location;
use App\Models\Setting;
+use App\Models\User;
use Exception;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
@@ -25,11 +26,11 @@ class CheckoutablesCheckedOutInBulkListener
public function handle(CheckoutablesCheckedOutInBulk $event): void
{
- $shouldSendEmailToUser = $this->shouldSendCheckoutEmailToUser($event->assets);
- $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress($event->assets);
-
$notifiableUser = $this->getNotifiableUser($event);
+ $shouldSendEmailToUser = $this->shouldSendCheckoutEmailToUser($notifiableUser, $event->assets);
+ $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress($event->assets);
+
if ($shouldSendEmailToUser && $notifiableUser) {
try {
Mail::to($notifiableUser)->send(new BulkAssetCheckoutMail(
@@ -65,8 +66,12 @@ class CheckoutablesCheckedOutInBulkListener
}
}
- private function shouldSendCheckoutEmailToUser(Collection $assets): bool
+ private function shouldSendCheckoutEmailToUser(?User $user, Collection $assets): bool
{
+ if (!$user->email) {
+ return false;
+ }
+
// @todo: how to handle assets having eula?
return $this->requiresAcceptance($assets);