mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-30 12:24:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Godfrey M
2025-10-22 10:48:05 -07:00
parent 324bc4957d b4696ef11e
commit 6134ca01ac
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Listeners/CheckoutableListener.php
View File

@ -461,15 +461,18 @@ class CheckoutableListener
return false;
}
return (bool) $setting->admin_cc_email;
return $setting->admin_cc_email || $setting->alert_email;
}
private function getFormattedAlertAddresses(): array
{
$alertAddresses = Setting::getSettings()->admin_cc_email;
{ $setting = Setting::getSettings();
$alertAddresses = [
$setting->admin_cc_email?? '',
$setting->alert_email?? '',
];
if ($alertAddresses !== '') {
return array_filter(array_map('trim', explode(',', $alertAddresses)));
return array_filter(array_map('trim', explode(',', implode(',',$alertAddresses))));
}
return [];