Merge pull request #3540 from jzinkweg/feature/incident-update-mail

Include incident update message in mail notification
cachethq · Apr 12, 2019 · 6a99399 · 6a99399
2 parents 4e86c8c + 0cbaa75
commit 6a99399
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php b/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php
@@ -78,6 +78,7 @@ public function toMail($notifiable)
             ->subject(trans('notifications.incident.update.mail.subject'))
             ->markdown('notifications.incident.update', [
                 'incident'               => $this->update->incident,
+                'update'                 => $this->update,
                 'content'                => $content,
                 'actionText'             => trans('notifications.incident.new.mail.action'),
                 'actionUrl'              => cachet_route('incident', [$this->update->incident]),

diff --git a/resources/views/notifications/incident/update.blade.php b/resources/views/notifications/incident/update.blade.php
@@ -1,11 +1,15 @@
 @component('mail::message')
 # {{ trans('notifications.incident.update.mail.title', ['name' => $incidentName, 'new_status' => $newStatus])  }}
 
-{{ $content }}
+{{ $update->message }}
+
+@component('mail::button', ['url' => $actionUrl])
+{{ $actionText }}
+@endcomponent
 
 Thanks,<br>
 {{ Config::get('setting.app_name') }}
 
 @include('notifications.partials.subscription')
 
-@endcomponent
+@endcomponent