From 41de6a4062944e6e93a4547688d2ffc244acef84 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 24 Mar 2021 14:20:51 +1100
Subject: [PATCH] Fixes for notifications

---
 app/DataMapper/CompanySettings.php            |  3 ++-
 .../Traits/Notifications/UserNotifies.php     | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index ce9b344e323e..ea342769bd7e 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -574,7 +574,8 @@ class CompanySettings extends BaseSettings
     public static function notificationDefaults() :stdClass
     {
         $notification = new stdClass;
-        $notification->email = ['all_notifications'];
+        $notification->email = [];
+        // $notification->email = ['all_notifications'];
 
         return $notification;
     }
diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php
index 91455c16ea5c..9710ee0282b7 100644
--- a/app/Utils/Traits/Notifications/UserNotifies.php
+++ b/app/Utils/Traits/Notifications/UserNotifies.php
@@ -30,14 +30,22 @@ trait UserNotifies
         $notifications = $company_user->notifications;
 
         //if a user owns this record or is assigned to it, they are attached the permission for notification.
-        if ($invitation->{$entity_name}->user_id == $company_user->_user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
-            array_push($required_permissions, 'all_user_notifications');
-        }
+        // if ($invitation->{$entity_name}->user_id == $company_user->_user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
+        //     array_push($required_permissions, 'all_user_notifications');
+        // }
+nlog($notifications);
+nlog($required_permissions);
+nlog($notifications->email);
+nlog(count(array_intersect($required_permissions, $notifications->email)));
+nlog(count(array_intersect(['all_user_notifications'], $notifications->email)));
+nlog(count(array_intersect(['all_notifications'],$notifications->email)));
 
-        if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect($required_permissions, ['all_user_notifications'])) >= 1 || count(array_intersect($required_permissions, ['all_notifications'])) >= 1) {
+        if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect(['all_user_notifications'],$notifications->email)) >= 1 || count(array_intersect(['all_notifications'],$notifications->email)) >= 1) {
             array_push($notifiable_methods, 'mail');
         }
 
+nlog($notifiable_methods);
+
         // if(count(array_intersect($required_permissions, $notifications->slack)) >=1)
         //     array_push($notifiable_methods, 'slack');
 
@@ -57,9 +65,9 @@ trait UserNotifies
             return [];
         }
 
-        if ($entity->user_id == $company_user->_user_id || $entity->assigned_user_id == $company_user->user_id) {
-            array_push($required_permissions, 'all_user_notifications');
-        }
+        // if ($entity->user_id == $company_user->_user_id || $entity->assigned_user_id == $company_user->user_id) {
+        //     array_push($required_permissions, 'all_user_notifications');
+        // }
 
         if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect($required_permissions, ['all_user_notifications'])) >= 1 || count(array_intersect($required_permissions, ['all_notifications'])) >= 1) {
             array_push($notifiable_methods, 'mail');