diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index ee1e4fe2b..181e26348 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -343,6 +343,10 @@ function send_user_an_email(MailMessage $mail, string $email, ?string $cc = null ); } } +function isTestEmailEnabled($notifiable) +{ + return data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled'); +} function isEmailEnabled($notifiable) { return data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled') || data_get($notifiable, 'use_instance_email_settings'); diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php index 8734b3c60..61c81dfa3 100644 --- a/resources/views/livewire/notifications/email-settings.blade.php +++ b/resources/views/livewire/notifications/email-settings.blade.php @@ -22,7 +22,8 @@ @endif @if (isEmailEnabled($team) && - auth()->user()->isAdminFromSession()) + auth()->user()->isAdminFromSession() && + isTestEmailEnabled($team)) Send Test Email diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php index 09fa6097c..3758ca373 100644 --- a/resources/views/livewire/settings/email.blade.php +++ b/resources/views/livewire/settings/email.blade.php @@ -22,7 +22,9 @@ Save - @if (isEmailEnabled($settings)) + @if (isEmailEnabled($settings) && + auth()->user()->isAdminFromSession() && + isTestEmailEnabled($settings)) Send Test Email