Merge pull request #15763 from Godmartinz/no_to_email_check

Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
snipe · Oct 31, 2024 · 5897d37 · 5897d37
2 parents 49de070 + 21a27dc
commit 5897d37
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
@@ -74,13 +74,17 @@ public function onCheckedOut($event)
              * 2. The item has a EULA
              * 3. The item should send an email at check-in/check-out
              */
-            if ($notifiable instanceof User && $notifiable->email != '') {
+
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
                     (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
-                Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    if (!empty($notifiable->email)) {
+                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    } else {
+                        Mail::cc($ccEmails)->send($mailable);
+                    }
                 Log::info('Sending email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
             }
-        }
+
 //                 Send Webhook notification
                 if ($this->shouldSendWebhookNotification()) {
                     if (Setting::getSettings()->webhook_selected === 'microsoft') {
@@ -148,13 +152,16 @@ public function onCheckedIn($event)
              * 3. The item should send an email at check-in/check-out
              */
 
-            if ($notifiable instanceof User && $notifiable->email != '') {
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
                     (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
-                    Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    if (!empty($notifiable->email)) {
+                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    } else {
+                        Mail::cc($ccEmails)->send($mailable);
+                    }
                     Log::info('Sending email, Locale: ' . $event->checkedOutTo->locale);
                 }
-            }
+
             // Send Webhook notification
             if ($this->shouldSendWebhookNotification()) {
                     Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)

diff --git a/routes/web.php b/routes/web.php
@@ -24,8 +24,6 @@
 use App\Http\Controllers\Auth\ForgotPasswordController;
 use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Livewire\Importer;
-use App\Models\Asset;
-use App\Models\User;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Auth;
 
@@ -551,22 +549,3 @@
     '/',
     [DashboardController::class, 'index']
 )->name('home');
-Route::get('/test-email', function() {
-    $item = Asset::find(1); // Load some test data
-    $admin = User::find(1);
-    $target = User::find(2);
-    $acceptance = null; // Simulate acceptance data
-    $note = 'Test note';
-
-    $fields = [];
-    if (($item->model) && ($item->model->fieldset)) {
-        $fields = $item->model->fieldset->fields;
-    }
-
-    return new \App\Mail\CheckoutAssetMail(
-        $item,
-        $admin,
-        $target,
-        $acceptance,
-        $note);
-});