Merge pull request #15808 from Godmartinz/check-license-for-email-boo…

…lean Fixed checkin/checkout email boolean check for Licenses
snipe · Nov 13, 2024 · 381c6e0 · 381c6e0
2 parents ada8e77 + 1061df8
commit 381c6e0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
@@ -77,7 +77,7 @@ public function onCheckedOut($event)
              */
 
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
+                    $this->checkoutableShouldSendEmail($event)) {
                     Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
                     if (!empty($notifiable)) {
                         Mail::to($notifiable)->cc($ccEmails)->send($mailable);
@@ -146,7 +146,6 @@ public function onCheckedIn($event)
         $ccEmails = array_filter($adminCcEmailsArray);
         $mailable =  $this->getCheckinMailType($event);
         $notifiable = $this->getNotifiables($event);
-
         if  (!$event->checkedOutTo->locale){
             $mailable->locale($event->checkedOutTo->locale);
         }
@@ -159,7 +158,7 @@ public function onCheckedIn($event)
              * 3. The item should send an email at check-in/check-out
              */
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
+                    $this->checkoutableShouldSendEmail($event)) {
                     Log::info('Sending checkin email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
                     if (!empty($notifiable)) {
                         Mail::to($notifiable)->cc($ccEmails)->send($mailable);
@@ -338,4 +337,12 @@ private function shouldSendWebhookNotification(): bool
     {
         return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
     }
+
+    private function checkoutableShouldSendEmail($event): bool
+    {
+        if($event->checkoutable instanceof LicenseSeat){
+            return $event->checkoutable->license->checkin_email();
+        }
+        return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
+    }
 }