Skip to content

A free open source IT asset/license management system

removed alert_email from accepted and declined notifications"

Godfrey Mdbb456f87ec0
diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php
index da5025c5c7..4bdf6774e8 100644
--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -34,20 +34,13 @@ class CheckoutAcceptance extends Model
$recipients = [];
- if (!empty($settings->alert_email)) {
- $recipients = array_merge(
- $recipients,
- array_map('trim', explode(',', $settings->alert_email))
- );
- }
-
if (!empty($settings->admin_cc_email)) {
$recipients = array_merge(
$recipients,
array_map('trim', explode(',', $settings->admin_cc_email))
);
}
-
+
return array_values(array_unique(array_filter($recipients)));
}
diff --git a/app/Notifications/AcceptanceItemAcceptedNotification.php b/app/Notifications/AcceptanceItemAcceptedNotification.php
index f614986c1b..34bb284b6f 100644
--- a/app/Notifications/AcceptanceItemAcceptedNotification.php
+++ b/app/Notifications/AcceptanceItemAcceptedNotification.php
@@ -67,7 +67,7 @@ class AcceptanceItemAcceptedNotification extends Notification implements ShouldQ
{
$settings = Setting::getSettings();
- return $settings->alerts_enabled && (!empty($settings->alert_email) || !empty($settings->admin_cc_email));
+ return ($settings->alerts_enabled && !empty($settings->admin_cc_email));
}
/**
diff --git a/app/Notifications/AcceptanceItemDeclinedNotification.php b/app/Notifications/AcceptanceItemDeclinedNotification.php
index 7fa4f09a89..782c3f9137 100644
--- a/app/Notifications/AcceptanceItemDeclinedNotification.php
+++ b/app/Notifications/AcceptanceItemDeclinedNotification.php
@@ -63,7 +63,7 @@ class AcceptanceItemDeclinedNotification extends Notification implements ShouldQ
{
$settings = Setting::getSettings();
- return $settings->alerts_enabled && (!empty($settings->alert_email) || !empty($settings->admin_cc_email));
+ return ($settings->alerts_enabled && !empty($settings->admin_cc_email));
}
/**