From 856e3b846b7ddab44d4017c635090a5dff9d9130 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 19 Jul 2021 07:50:22 +1000 Subject: [PATCH] Fixes for viewed entity notifications --- app/Listeners/Misc/InvitationViewedListener.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/Listeners/Misc/InvitationViewedListener.php b/app/Listeners/Misc/InvitationViewedListener.php index 4df1f36209ce..e77b0d08296e 100644 --- a/app/Listeners/Misc/InvitationViewedListener.php +++ b/app/Listeners/Misc/InvitationViewedListener.php @@ -47,8 +47,6 @@ class InvitationViewedListener implements ShouldQueue $entity_name = lcfirst(class_basename($event->entity)); $invitation = $event->invitation; - // $notification = new EntityViewedNotification($invitation, $entity_name); - $nmo = new NinjaMailerObject; $nmo->mailable = new NinjaMailer( (new EntityViewedObject($invitation, $entity_name))->build() ); $nmo->company = $invitation->company; @@ -57,8 +55,9 @@ class InvitationViewedListener implements ShouldQueue foreach ($invitation->company->company_users as $company_user) { $entity_viewed = "{$entity_name}_viewed"; + $entity_viewed_all = "{$entity_name}_viewed_all"; - $methods = $this->findUserNotificationTypes($invitation, $company_user, $entity_name, ['all_notifications', $entity_viewed]); + $methods = $this->findUserNotificationTypes($invitation, $company_user, $entity_name, ['all_notifications', $entity_viewed, $entity_viewed_all]); if (($key = array_search('mail', $methods)) !== false) { unset($methods[$key]); @@ -68,16 +67,7 @@ class InvitationViewedListener implements ShouldQueue } - // $notification->method = $methods; - - // $company_user->user->notify($notification); } - // if (isset($invitation->company->slack_webhook_url)) { - // $notification->method = ['slack']; - - // Notification::route('slack', $invitation->company->slack_webhook_url) - // ->notify($notification); - // } } }