Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for notifications

Browse Source
This commit is contained in:
= 2021-03-24 14:20:51 +11:00
parent db4f8946e4
commit 41de6a4062
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/DataMapper/CompanySettings.php
View File

@ -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;
}

22
app/Utils/Traits/Notifications/UserNotifies.php
View File

@ -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');