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 notification gates

Browse Source
This commit is contained in:
David Bomba 2021-03-31 13:28:03 +11:00
parent 89a271e59c
commit 9c4a223923
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Listeners/Payment/PaymentNotification.php
View File

@ -59,7 +59,7 @@ class PaymentNotification implements ShouldQueue
foreach ($payment->company->company_users as $company_user) { foreach ($payment->company->company_users as $company_user) {
$user = $company_user->user; $user = $company_user->user;
$methods = $this->findUserEntityNotificationType($payment, $company_user, ['payment_success_all', 'all_notifications']); $methods = $this->findUserEntityNotificationType($payment, $company_user, ['payment_success', 'payment_success_all', 'all_notifications']);
if (($key = array_search('mail', $methods)) !== false) { if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]); unset($methods[$key]);

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

@ -38,8 +38,6 @@ trait UserNotifies
array_push($notifiable_methods, 'mail'); array_push($notifiable_methods, 'mail');
} }
nlog($notifiable_methods);
// if(count(array_intersect($required_permissions, $notifications->slack)) >=1) // if(count(array_intersect($required_permissions, $notifications->slack)) >=1)
// array_push($notifiable_methods, 'slack'); // array_push($notifiable_methods, 'slack');
@ -63,10 +61,11 @@ nlog($notifiable_methods);
array_push($required_permissions, 'all_user_notifications'); 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) { 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'); array_push($notifiable_methods, 'mail');
} }
return $notifiable_methods; return $notifiable_methods;
} }