diff --git a/app/Notifications/Common/ExportCompleted.php b/app/Notifications/Common/ExportCompleted.php index 5a7dd07f0..660646446 100644 --- a/app/Notifications/Common/ExportCompleted.php +++ b/app/Notifications/Common/ExportCompleted.php @@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Support\HtmlString; class ExportCompleted extends Notification implements ShouldQueue { @@ -52,6 +53,7 @@ class ExportCompleted extends Notification implements ShouldQueue { return (new MailMessage) ->subject(trans('notifications.export.completed.title')) + ->line(new HtmlString('

')) ->line(trans('notifications.export.completed.description')) ->action(trans('general.download'), $this->download_url); } diff --git a/app/Notifications/Common/ExportFailed.php b/app/Notifications/Common/ExportFailed.php index 36ea8c25a..90eaeed12 100644 --- a/app/Notifications/Common/ExportFailed.php +++ b/app/Notifications/Common/ExportFailed.php @@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Support\HtmlString; class ExportFailed extends Notification implements ShouldQueue { @@ -51,8 +52,11 @@ class ExportFailed extends Notification implements ShouldQueue { return (new MailMessage) ->subject(trans('notifications.export.failed.title')) + ->line(new HtmlString('

')) ->line(trans('notifications.export.failed.description')) - ->line($this->message); + ->line(new HtmlString('

')) + ->line($this->message) + ->line(new HtmlString('

')); } /** diff --git a/app/Notifications/Common/ImportCompleted.php b/app/Notifications/Common/ImportCompleted.php index 155c547f9..fc69db0ef 100644 --- a/app/Notifications/Common/ImportCompleted.php +++ b/app/Notifications/Common/ImportCompleted.php @@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Support\HtmlString; class ImportCompleted extends Notification implements ShouldQueue { @@ -49,6 +50,7 @@ class ImportCompleted extends Notification implements ShouldQueue return (new MailMessage) ->subject(trans('notifications.import.completed.title')) + ->line(new HtmlString('

')) ->line(trans('notifications.import.completed.description')) ->action(trans_choice('general.dashboards', 1), $dashboard_url); } diff --git a/app/Notifications/Common/ImportFailed.php b/app/Notifications/Common/ImportFailed.php index 89939f757..21c9c66f1 100644 --- a/app/Notifications/Common/ImportFailed.php +++ b/app/Notifications/Common/ImportFailed.php @@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Support\HtmlString; class ImportFailed extends Notification implements ShouldQueue { @@ -51,12 +52,16 @@ class ImportFailed extends Notification implements ShouldQueue { $message = (new MailMessage) ->subject(trans('notifications.import.failed.title')) + ->line(new HtmlString('

')) ->line(trans('notifications.import.failed.description')); foreach ($this->errors as $error) { + $message->line(new HtmlString('

')); $message->line($error); } + $message->line(new HtmlString('

')); + return $message; } diff --git a/app/Notifications/Email/InvalidEmail.php b/app/Notifications/Email/InvalidEmail.php index 8d02e9ef5..759addc21 100644 --- a/app/Notifications/Email/InvalidEmail.php +++ b/app/Notifications/Email/InvalidEmail.php @@ -55,11 +55,9 @@ class InvalidEmail extends Notification implements ShouldQueue return (new MailMessage) ->subject(trans('notifications.email.invalid.title', ['type' => $this->type])) - ->line(new HtmlString('
')) - ->line(new HtmlString('
')) + ->line(new HtmlString('

')) ->line(trans('notifications.email.invalid.description', ['email' => $this->email])) - ->line(new HtmlString('
')) - ->line(new HtmlString('
')) + ->line(new HtmlString('

')) ->line(new HtmlString('' . $this->error . '')) ->action(trans_choice('general.dashboards', 1), $dashboard_url); }