diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php index aad1f6a9c..c3d9f987d 100644 --- a/app/Http/Livewire/Notifications/EmailSettings.php +++ b/app/Http/Livewire/Notifications/EmailSettings.php @@ -23,17 +23,18 @@ class EmailSettings extends Component 'model.extra_attributes.smtp_username' => 'nullable', 'model.extra_attributes.smtp_password' => 'nullable', 'model.extra_attributes.smtp_timeout' => 'nullable', - 'model.extra_attributes.test_notification_email' => 'nullable|email', + 'model.extra_attributes.test_notification_recipients' => 'nullable', ]; protected $validationAttributes = [ - 'model.extra_attributes.from_address' => 'From Address', - 'model.extra_attributes.from_name' => 'From Name', - 'model.extra_attributes.recipients' => 'Recipients', - 'model.extra_attributes.smtp_host' => 'Host', - 'model.extra_attributes.smtp_port' => 'Port', - 'model.extra_attributes.smtp_encryption' => 'Encryption', - 'model.extra_attributes.smtp_username' => 'Username', - 'model.extra_attributes.smtp_password' => 'Password', + 'model.extra_attributes.from_address' => '', + 'model.extra_attributes.from_name' => '', + 'model.extra_attributes.recipients' => '', + 'model.extra_attributes.smtp_host' => '', + 'model.extra_attributes.smtp_port' => '', + 'model.extra_attributes.smtp_encryption' => '', + 'model.extra_attributes.smtp_username' => '', + 'model.extra_attributes.smtp_password' => '', + 'model.extra_attributes.test_notification_recipients' => '', ]; public function mount($model) { @@ -43,6 +44,8 @@ class EmailSettings extends Component { $this->resetErrorBag(); $this->validate(); + $this->model->extra_attributes->recipients = str_replace(' ', '', $this->model->extra_attributes->recipients); + $this->model->extra_attributes->test_notification_recipients = str_replace(' ', '', $this->model->extra_attributes->test_notification_recipients); $this->saveModel(); } private function saveModel() diff --git a/app/Notifications/Channels/EmailChannel.php b/app/Notifications/Channels/EmailChannel.php index 9c6840b95..d2d64788a 100644 --- a/app/Notifications/Channels/EmailChannel.php +++ b/app/Notifications/Channels/EmailChannel.php @@ -15,7 +15,7 @@ class EmailChannel { $this->bootConfigs($notifiable); if ($notification instanceof \App\Notifications\TestNotification) { - $bcc = $notifiable->routeNotificationForEmail('test_notification_email'); + $bcc = $notifiable->routeNotificationForEmail('test_notification_recipients'); if (count($bcc) === 0) { $bcc = $notifiable->routeNotificationForEmail(); } diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php index 4b6fc9756..aa4a7eb23 100644 --- a/bootstrap/helpers/remoteProcess.php +++ b/bootstrap/helpers/remoteProcess.php @@ -91,7 +91,7 @@ function instant_remote_process(array $command, Server $server, $throwError = tr ray('executing again'); return instant_remote_process($command, $server, $throwError, $repeat - 1); } - ray($process->errorOutput()); + ray('ERROR OCCURED: ' . $process->errorOutput()); if (!$throwError) { return null; } diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php index ac2bde6a1..78d831f37 100644 --- a/resources/views/livewire/notifications/email-settings.blade.php +++ b/resources/views/livewire/notifications/email-settings.blade.php @@ -9,11 +9,12 @@
- +
- +