lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #3101

Browse Source
This commit is contained in:
James Wilson
2018-10-10 14:00:51 +01:00
parent 48769d7e7c
commit 18219bf328
6 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Notifications/Component/ComponentStatusChangedNotification.php
View File

@@ -84,12 +84,15 @@ class ComponentStatusChangedNotification extends Notification
]);
return (new MailMessage())
->subject(trans('notifications.component.status_update.mail.subject'))
->greeting(trans('notifications.component.status_update.mail.subject'))
->line($content)
->action(trans('notifications.component.status_update.mail.action'), cachet_route('status-page'))
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
->subject(trans('notifications.component.status_update.mail.subject'))
->markdown('notifications.component.update', [
'componentName' => $this->component->name,
'content' => $content,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**

24
app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php
View File

@@ -73,18 +73,20 @@ class IncidentUpdatedNotification extends Notification
'name' => $this->update->incident->name,
'time' => $this->update->created_at_diff,
]);
return (new MailMessage())
->subject(trans('notifications.incident.update.mail.subject'))
->greeting(trans('notifications.incident.update.mail.title', [
'name' => $this->update->incident->name,
'new_status' => $this->update->human_status,
]))
->line($content)
->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident]))
->line($this->update->raw_message)
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
->subject(trans('notifications.incident.update.mail.subject'))
->markdown('notifications.incident.update', [
'incident' => $this->update->incident,
'content' => $content,
'actionText' => trans('notifications.incident.new.mail.action'),
'actionUrl' => cachet_route('incident', [$this->update->incident]),
'incidentName' => $this->update->incident->name,
'newStatus' => $this->update->human_status,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**

13
app/Notifications/Schedule/NewScheduleNotification.php
View File

@@ -74,11 +74,14 @@ class NewScheduleNotification extends Notification
]);
return (new MailMessage())
->subject(trans('notifications.schedule.new.mail.subject'))
->greeting(trans('notifications.schedule.new.mail.title'))
->line($content)
->action(trans('notifications.schedule.new.mail.action'), cachet_route('schedule', [$this->schedule]))
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
->subject(trans('notifications.schedule.new.mail.subject'))
->markdown('notifications.schedule.new', [
'content' => $content,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**