From d80b0f77c504b3850d9a38d893e317fa0c313836 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 12 Jun 2023 12:52:58 +0200
Subject: [PATCH] updates

---
 app/Http/Livewire/Notifications/EmailSettings.php           | 2 +-
 app/Notifications/Channels/EmailChannel.php                 | 6 +++++-
 .../views/livewire/notifications/email-settings.blade.php   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php
index 5e7c8323c..2d97eccdc 100644
--- a/app/Http/Livewire/Notifications/EmailSettings.php
+++ b/app/Http/Livewire/Notifications/EmailSettings.php
@@ -16,7 +16,7 @@ class EmailSettings extends Component
         'model.extra_attributes.smtp_active' => 'nullable|boolean',
         'model.extra_attributes.smtp_from_address' => 'required|email',
         'model.extra_attributes.smtp_from_name' => 'required',
-        'model.extra_attributes.smtp_recipients' => 'required',
+        'model.extra_attributes.smtp_recipients' => 'nullable',
         'model.extra_attributes.smtp_host' => 'required',
         'model.extra_attributes.smtp_port' => 'required',
         'model.extra_attributes.smtp_encryption' => 'nullable',
diff --git a/app/Notifications/Channels/EmailChannel.php b/app/Notifications/Channels/EmailChannel.php
index b2da2bb24..4aa4b761f 100644
--- a/app/Notifications/Channels/EmailChannel.php
+++ b/app/Notifications/Channels/EmailChannel.php
@@ -11,11 +11,15 @@ class EmailChannel
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
         $this->bootConfigs($notifiable);
-
         $is_test_notification = $notification instanceof \App\Notifications\TestNotification;
 
         if ($is_test_notification) {
             $bcc = $notifiable->routeNotificationForEmail('smtp_test_recipients');
+            if (count($bcc) === 0) {
+                if ($notifiable instanceof \App\Models\Team) {
+                    $bcc = $notifiable->members()->pluck('email')->toArray();
+                }
+            }
         } else {
             $bcc = $notifiable->routeNotificationForEmail();
         }
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index 66829ebc7..f195be0b9 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -22,9 +22,11 @@
         </div>
 
         <div class="flex gap-2">
-            <x-forms.input required id="model.extra_attributes.smtp_recipients"
+            <x-forms.input id="model.extra_attributes.smtp_recipients"
+                placeholder="If empty, all users will be notified in the team."
                 helper="Email list to send the all notifications to, separated by comma." label="Recipient(s)" />
             <x-forms.input id="model.extra_attributes.smtp_test_recipients" label="Test Notification Recipient(s)"
+                placeholder="If empty, all users will be notified in the team."
                 helper="Email list to send the test notification to, separated by comma." />
         </div>
         <div class="flex flex-col gap-2 xl:flex-row">