@@ -63,11 +63,9 @@ public function onCheckedOut($event)
6363 }
6464 $ ccEmails = array_filter ($ adminCcEmailsArray );
6565 $ mailable = $ this ->getCheckoutMailType ($ event , $ acceptance );
66- $ notifiable = $ this ->getNotifiables ($ event );
66+ $ notifiable = $ this ->getNotifiableUsers ($ event );
67+
6768
68- if ($ event ->checkedOutTo ->locale ) {
69- $ mailable ->locale ($ event ->checkedOutTo ->locale );
70- }
7169 // Send email notifications
7270 try {
7371 /**
@@ -79,7 +77,7 @@ public function onCheckedOut($event)
7977
8078 if ($ event ->checkoutable ->requireAcceptance () || $ event ->checkoutable ->getEula () ||
8179 $ this ->checkoutableShouldSendEmail ($ event )) {
82- Log::info ('Sending checkout email, Locale: ' . ($ event ->checkedOutTo ->locale ?? 'default ' ));
80+ // Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
8381 if (!empty ($ notifiable )) {
8482 Mail::to ($ notifiable )->cc ($ ccEmails )->send ($ mailable );
8583 } elseif (!empty ($ ccEmails )) {
@@ -161,10 +159,8 @@ public function onCheckedIn($event)
161159 }
162160 $ ccEmails = array_filter ($ adminCcEmailsArray );
163161 $ mailable = $ this ->getCheckinMailType ($ event );
164- $ notifiable = $ this ->getNotifiables ($ event );
165- if ($ event ->checkedOutTo ?->locale) {
166- $ mailable ->locale ($ event ->checkedOutTo ->locale );
167- }
162+ $ notifiable = $ this ->getNotifiableUsers ($ event );
163+
168164 // Send email notifications
169165 try {
170166 /**
@@ -175,7 +171,6 @@ public function onCheckedIn($event)
175171 */
176172 if ($ event ->checkoutable ->requireAcceptance () || $ event ->checkoutable ->getEula () ||
177173 $ this ->checkoutableShouldSendEmail ($ event )) {
178- Log::info ('Sending checkin email, Locale: ' . ($ event ->checkedOutTo ->locale ?? 'default ' ));
179174 if (!empty ($ notifiable )) {
180175 Mail::to ($ notifiable )->cc ($ ccEmails )->send ($ mailable );
181176 } elseif (!empty ($ ccEmails )){
@@ -324,17 +319,26 @@ private function getCheckinMailType($event){
324319 return new $ mailable ($ event ->checkoutable , $ event ->checkedOutTo , $ event ->checkedInBy , $ event ->note );
325320
326321 }
327- private function getNotifiables ($ event ){
322+
323+ /**
324+ * This gets the recipient objects based on the type of checkoutable.
325+ * The 'name' property for users is set in the boot method in the User model.
326+ *
327+ * @see \App\Models\User::boot()
328+ * @param $event
329+ * @return mixed
330+ */
331+ private function getNotifiableUsers ($ event ){
328332
329333 if ($ event ->checkedOutTo instanceof Asset){
330334 $ event ->checkedOutTo ->load ('assignedTo ' );
331- return $ event ->checkedOutTo ->assignedto ?->email ?? '' ;
335+ return $ event ->checkedOutTo ->assignedto ;
332336 }
333337 else if ($ event ->checkedOutTo instanceof Location) {
334- return $ event ->checkedOutTo ->manager ?->email ?? '' ;
338+ return $ event ->checkedOutTo ->manager ;
335339 }
336340 else {
337- return $ event ->checkedOutTo ?->email ?? '' ;
341+ return $ event ->checkedOutTo ;
338342 }
339343 }
340344 private function webhookSelected (){
0 commit comments