Merge branch 'develop' into refacto_ms_teams_notifs

# Conflicts:
#	app/Listeners/CheckoutableListener.php

app/Notifications/CheckinAccessoryNotification.php

@@ -6,6 +6,7 @@ use App\Models\Accessory;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
@@ -56,22 +57,9 @@ class CheckinAccessoryNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = 'slack';
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
-        /**
-         * Only send notifications to users that have email addresses
-         */
-        if ($this->target instanceof User && $this->target->email != '') {
-            Log::debug('The target is a user');
-
-            if ($this->item->checkin_email()) {
-                $notifyBy[] = 'mail';
-            }
-        }
-
-        Log::debug('checkin_email on this category is '.$this->item->checkin_email());
-
         return $notifyBy;
     }
 
@@ -154,24 +142,4 @@ class CheckinAccessoryNotification extends Notification
             );
 
     }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        Log::debug('to email called');
-
-        return (new MailMessage)->markdown('notifications.markdown.checkin-accessory',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-            ])
-            ->subject(trans('mail.Accessory_Checkin_Notification'));
-    }
 }