From cc467dfbb99fda484b50a432007a2c8888fb2814 Mon Sep 17 00:00:00 2001 From: JapSeyz Date: Tue, 15 Nov 2016 14:26:37 +0100 Subject: [PATCH] Removed non-unique email templates --- app/Handlers/QueueHandler.php | 2 +- .../Controllers/EventAttendeesController.php | 4 ++-- .../Controllers/EventOrdersController.php | 4 ++-- app/Http/Controllers/EventViewController.php | 2 +- app/Mailers/AttendeeMailer.php | 2 +- .../views/Emails/messageAttendees.blade.php | 19 ------------------- resources/views/Emails/messageOrder.blade.php | 18 ------------------ .../views/Emails/messageOrganiser.blade.php | 19 ------------------- .../views/Emails/messageReceived.blade.php | 19 +++++++++++++++++++ 9 files changed, 26 insertions(+), 63 deletions(-) delete mode 100644 resources/views/Emails/messageAttendees.blade.php delete mode 100644 resources/views/Emails/messageOrder.blade.php delete mode 100644 resources/views/Emails/messageOrganiser.blade.php create mode 100644 resources/views/Emails/messageReceived.blade.php diff --git a/app/Handlers/QueueHandler.php b/app/Handlers/QueueHandler.php index 7afc3ac3..b01d55df 100644 --- a/app/Handlers/QueueHandler.php +++ b/app/Handlers/QueueHandler.php @@ -75,7 +75,7 @@ class QueueHandler 'subject' => $message_object->subject, ]; - Mail::send('Emails.messageAttendees', $data, function ($message) use ($toFields, $event, $message_object) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($toFields, $event, $message_object) { $message->to($toFields) ->from(config('attendize.outgoing_email_noreply'), $event->organiser->name) ->replyTo($event->organiser->email, $event->organiser->name) diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index ecedfc88..d85c1ac9 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -432,7 +432,7 @@ class EventAttendeesController extends MyBaseController ]; //@todo move this to the SendAttendeeMessage Job - Mail::send('Emails.messageAttendees', $data, function ($message) use ($attendee, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { $message->to($attendee->email, $attendee->full_name) ->from(config('attendize.outgoing_email_noreply'), $attendee->event->organiser->name) ->replyTo($attendee->event->organiser->email, $attendee->event->organiser->name) @@ -441,7 +441,7 @@ class EventAttendeesController extends MyBaseController /* Could bcc in the above? */ if ($request->get('send_copy') == '1') { - Mail::send('Emails.messageAttendees', $data, function ($message) use ($attendee, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { $message->to($attendee->event->organiser->email, $attendee->event->organiser->name) ->from(config('attendize.outgoing_email_noreply'), $attendee->event->organiser->name) ->replyTo($attendee->event->organiser->email, $attendee->event->organiser->name) diff --git a/app/Http/Controllers/EventOrdersController.php b/app/Http/Controllers/EventOrdersController.php index 8f8d5430..68474f5f 100644 --- a/app/Http/Controllers/EventOrdersController.php +++ b/app/Http/Controllers/EventOrdersController.php @@ -333,7 +333,7 @@ class EventOrdersController extends MyBaseController 'email_logo' => $order->event->organiser->full_logo_path, ]; - Mail::send('Emails.messageOrder', $data, function ($message) use ($order, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($order, $data) { $message->to($order->email, $order->full_name) ->from(config('attendize.outgoing_email_noreply'), $order->event->organiser->name) ->replyTo($order->event->organiser->email, $order->event->organiser->name) @@ -342,7 +342,7 @@ class EventOrdersController extends MyBaseController /* Send a copy to the Organiser with a different subject */ if ($request->get('send_copy') == '1') { - Mail::send('Emails.messageOrder', $data, function ($message) use ($order, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($order, $data) { $message->to($order->event->organiser->email) ->from(config('attendize.outgoing_email_noreply'), $order->event->organiser->name) ->replyTo($order->event->organiser->email, $order->event->organiser->name) diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index fac01cc0..48a54461 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -112,7 +112,7 @@ class EventViewController extends Controller 'event' => $event, ]; - Mail::send('Emails.messageOrganiser', $data, function ($message) use ($event, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($event, $data) { $message->to($event->organiser->email, $event->organiser->name) ->from(config('attendize.outgoing_email_noreply'), $data['sender_name']) ->replyTo($data['sender_email'], $data['sender_name']) diff --git a/app/Mailers/AttendeeMailer.php b/app/Mailers/AttendeeMailer.php index 7636f6f9..974b7893 100644 --- a/app/Mailers/AttendeeMailer.php +++ b/app/Mailers/AttendeeMailer.php @@ -57,7 +57,7 @@ class AttendeeMailer extends Mailer 'email_logo' => $attendee->event->organiser->full_logo_path, ]; - Mail::send('Emails.messageAttendees', $data, function ($message) use ($attendee, $data) { + Mail::send('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { $message->to($attendee->email, $attendee->full_name) ->from(config('attendize.outgoing_email_noreply'), $attendee->event->organiser->name) ->replyTo($attendee->event->organiser->email, $attendee->event->organiser->name) diff --git a/resources/views/Emails/messageAttendees.blade.php b/resources/views/Emails/messageAttendees.blade.php deleted file mode 100644 index 1eeab93c..00000000 --- a/resources/views/Emails/messageAttendees.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('Emails.Layouts.Master') - -@section('message_content') - -

Hi there,

-

You have received a message from {{{$event->organiser->name}}} in relation to the event {{{$event->title}}}.

-

- {{nl2br($message_content)}} -

- -

- You can contact {{{$event->organiser->name}}} directly at {{{$event->organiser->email}}}, or by replying to this email. -

-@stop - -@section('footer') - - -@stop diff --git a/resources/views/Emails/messageOrder.blade.php b/resources/views/Emails/messageOrder.blade.php deleted file mode 100644 index f064e867..00000000 --- a/resources/views/Emails/messageOrder.blade.php +++ /dev/null @@ -1,18 +0,0 @@ -@extends('Emails.Layouts.Master') - -@section('message_content') - -

Hi there,

-

You have received a message from {{{$event->organiser->name}}} in relation to the event {{{$event->title}}}.

-

- {{nl2br($message_content)}} -

- -

- You can contact {{{$event->organiser->name}}} directly at {{{$event->organiser->email}}}, or by replying to this email. -

-@stop - -@section('footer') - -@stop diff --git a/resources/views/Emails/messageOrganiser.blade.php b/resources/views/Emails/messageOrganiser.blade.php deleted file mode 100644 index 269a1b05..00000000 --- a/resources/views/Emails/messageOrganiser.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('Emails.Layouts.Master') - -@section('message_content') - -

Hi there,

-

You have received a message from {{$sender_name}} in relation to the event {{$event->title}}.

-

- {!! nl2br($message_content) !!} -

- -

- You can contact {{$sender_name}} directly at {{$sender_email}}, or by replying to this email. -

-@stop - -@section('footer') - - -@stop diff --git a/resources/views/Emails/messageReceived.blade.php b/resources/views/Emails/messageReceived.blade.php new file mode 100644 index 00000000..21089e3b --- /dev/null +++ b/resources/views/Emails/messageReceived.blade.php @@ -0,0 +1,19 @@ +@extends('Emails.Layouts.Master') + +@section('message_content') + +

Hi there,

+

You have received a message from {{ (isset($sender_name) ? $sender_name : $event->organiser->name) }} in relation to the event {{ $event->title }}.

+

+ {{nl2br($message_content)}} +

+ +

+ You can contact {{ (isset($sender_name) ? $sender_name : $event->organiser->name) }} directly at {{ (isset($sender_email) ? $sender_email : $event->organiser->email) }}, or by replying to this email. +

+@stop + +@section('footer') + + +@stop