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:
David Bomba 2021-11-27 20:24:31 +11:00
parent 94fa01091d
commit 08d2250ca8
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,12 @@ 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', 'payment_success_all', 'all_notifications']); $methods = $this->findUserEntityNotificationType($payment, $company_user, [
'payment_success',
'payment_success_all',
'payment_success_user',
'all_notifications']
);
if (($key = array_search('mail', $methods)) !== false) { if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]); unset($methods[$key]);

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

@ -38,27 +38,23 @@ trait UserNotifies
if ($invitation->{$entity_name}->user_id == $company_user->_user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) { if ($invitation->{$entity_name}->user_id == $company_user->_user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
$required_permissions = $this->addSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions); $required_permissions = $this->addSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
} }
else{
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) { $required_permissions = $this->removeSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
array_push($notifiable_methods, 'mail');
} }
// if(count(array_intersect($required_permissions, $notifications->slack)) >=1) if (count(array_intersect($required_permissions, $notifications->email)) >= 1) {
// array_push($notifiable_methods, 'slack'); array_push($notifiable_methods, 'mail');
}
return $notifiable_methods; return $notifiable_methods;
} }
public function findUserEntityNotificationType($entity, $company_user, $required_permissions) :array public function findUserEntityNotificationType($entity, $company_user, array $required_permissions) :array
{ {
if ($company_user->company->is_disabled) {
return [];
}
$notifiable_methods = []; $notifiable_methods = [];
$notifications = $company_user->notifications; $notifications = $company_user->notifications;
if (! $notifications) { if ($company_user->company->is_disabled || ! $notifications) {
return []; return [];
} }
@ -69,36 +65,41 @@ trait UserNotifies
$required_permissions = $this->removeSpecialUserPermissionForEntity($entity, $required_permissions); $required_permissions = $this->removeSpecialUserPermissionForEntity($entity, $required_permissions);
} }
if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect(['all_notifications'],$notifications->email)) >= 1) { if (count(array_intersect($required_permissions, $notifications->email)) >= 1) {
array_push($notifiable_methods, 'mail'); array_push($notifiable_methods, 'mail');
} }
return $notifiable_methods; return $notifiable_methods;
} }
private function addSpecialUserPermissionForEntity($entity, $required_permissions) private function addSpecialUserPermissionForEntity($entity, array $required_permissions) :array
{ {
array_push($required_permissions, ["all_notifications"]);
switch ($entity) { switch ($entity) {
case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment) case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
return array_push($required_permissions, ["all_user_notifications","payment_failure_user","payment_success_user"]); return array_merge($required_permissions, ["all_notifications","all_user_notifications","payment_failure_user","payment_success_user"]);
break; break;
case ($entity instanceof Invoice): case ($entity instanceof Invoice):
return array_push($required_permissions, ["all_user_notifications","invoice_created_user","invoice_sent_user","invoice_viewed_user","invoice_late_user"]); return array_merge($required_permissions, ["all_notifications","all_user_notifications","invoice_created_user","invoice_sent_user","invoice_viewed_user","invoice_late_user"]);
break; break;
case ($entity instanceof Quote): case ($entity instanceof Quote):
return array_push($required_permissions, ["all_user_notifications","quote_created_user","quote_sent_user","quote_viewed_user","quote_approved_user","quote_expired_user"]); return array_merge($required_permissions, ["all_notifications","all_user_notifications","quote_created_user","quote_sent_user","quote_viewed_user","quote_approved_user","quote_expired_user"]);
break; break;
case ($entity instanceof Credit): case ($entity instanceof Credit):
return array_push($required_permissions, ["all_user_notifications","credit_created_user","credit_sent_user","credit_viewed_user"]); return array_merge($required_permissions, ["all_notifications","all_user_notifications","credit_created_user","credit_sent_user","credit_viewed_user"]);
break; break;
default: default:
// code... return [];
break; break;
} }
} }
private function removeSpecialUserPermissionForEntity($entity, $required_permissions) private function removeSpecialUserPermissionForEntity($entity, $required_permissions)
{ {
array_merge($required_permissions, ["all_notifications"]);
switch ($entity) { switch ($entity) {
case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment) case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
return array_diff($required_permissions, ["all_user_notifications","payment_failure_user","payment_success_user"]); return array_diff($required_permissions, ["all_user_notifications","payment_failure_user","payment_success_user"]);