DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting

Browse source 
Have acceptance result notifications adhere to alerts enabled setting
This commit is contained in:
snipe 2023-02-15 18:46:08 -08:00 committed by GitHub
parent 9f8ea9a243 a45ce468cc
commit e9ab90eafc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Models/CheckoutAcceptance.php
View file

@ -16,12 +16,16 @@ class CheckoutAcceptance extends Model
'declined_at' => 'datetime',
];
// Get the mail recipient from the config
public function routeNotificationForMail(): string
/**
* Get the mail recipient from the config
*
* @return mixed|string|null
*/
public function routeNotificationForMail()
{
// At this point the endpoint is the same for everything.
// In the future this may want to be adapted for individual notifications.
return (config('mail.reply_to.address')) ? config('mail.reply_to.address') : '' ;
return Setting::getSettings()->alert_email;
}
/**

5
app/Notifications/AcceptanceAssetAcceptedNotification.php
View file

@ -46,6 +46,11 @@ class AcceptanceAssetAcceptedNotification extends Notification
}
public function shouldSend($notifiable, $channel)
{
return $this->settings->alerts_enabled && ! empty($this->settings->alert_email);
}
/**
* Get the mail representation of the notification.
*

5
app/Notifications/AcceptanceAssetDeclinedNotification.php
View file

@ -44,6 +44,11 @@ class AcceptanceAssetDeclinedNotification extends Notification
}
public function shouldSend($notifiable, $channel)
{
return $this->settings->alerts_enabled && ! empty($this->settings->alert_email);
}
/**
* Get the mail representation of the notification.
*