Removed non-unique email templates

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)

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)

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)

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'])

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)

resources/views/Emails/messageAttendees.blade.php

@@ -1,19 +0,0 @@
-@extends('Emails.Layouts.Master')
-
-@section('message_content')
-
-<p>Hi there,</p>
-<p>You have received a message from <b>{{{$event->organiser->name}}}</b> in relation to the event <b>{{{$event->title}}}</b>.</p>
-<p style="padding: 10px; margin:10px; border: 1px solid #f3f3f3;">
-    {{nl2br($message_content)}}
-</p>
-
-<p>
-    You can contact <b>{{{$event->organiser->name}}}</b> directly at <a href='mailto:{{{$event->organiser->email}}}'>{{{$event->organiser->email}}}</a>, or by replying to this email.
-</p>
-@stop
-
-@section('footer')
-
-
-@stop

resources/views/Emails/messageOrder.blade.php

@@ -1,18 +0,0 @@
-@extends('Emails.Layouts.Master')
-
-@section('message_content')
-
-<p>Hi there,</p>
-<p>You have received a message from <b>{{{$event->organiser->name}}}</b> in relation to the event <b>{{{$event->title}}}</b>.</p>
-<p style="padding: 10px; margin:10px; border: 1px solid #f3f3f3;">
-    {{nl2br($message_content)}}
-</p>
-
-<p>
-    You can contact <b>{{{$event->organiser->name}}}</b> directly at <a href='mailto:{{{$event->organiser->email}}}'>{{{$event->organiser->email}}}</a>, or by replying to this email.
-</p>
-@stop
-
-@section('footer')
-
-@stop

resources/views/Emails/messageOrganiser.blade.php

@@ -1,19 +0,0 @@
-@extends('Emails.Layouts.Master')
-
-@section('message_content')
-
-    <p>Hi there,</p>
-    <p>You have received a message from <b>{{$sender_name}}</b> in relation to the event <b>{{$event->title}}</b>.</p>
-    <p style="padding: 10px; margin:10px; border: 1px solid #f3f3f3;">
-       {!! nl2br($message_content) !!}
-    </p>
-
-    <p>
-        You can contact <b>{{$sender_name}}</b> directly at <a href='mailto:{{$sender_email}}}'>{{$sender_email}}</a>, or by replying to this email.
-    </p>
-@stop
-
-@section('footer')
-
-
-@stop

resources/views/Emails/messageReceived.blade.php

@@ -0,0 +1,19 @@
+@extends('Emails.Layouts.Master')
+
+@section('message_content')
+
+<p>Hi there,</p>
+<p>You have received a message from <b>{{ (isset($sender_name) ? $sender_name : $event->organiser->name) }}</b> in relation to the event <b>{{ $event->title }}</b>.</p>
+<p style="padding: 10px; margin:10px; border: 1px solid #f3f3f3;">
+    {{nl2br($message_content)}}
+</p>
+
+<p>
+    You can contact <b>{{ (isset($sender_name) ? $sender_name : $event->organiser->name) }}</b> directly at <a href='mailto:{{ (isset($sender_email) ? $sender_email : $event->organiser->email) }}'>{{ (isset($sender_email) ? $sender_email : $event->organiser->email) }}</a>, or by replying to this email.
+</p>
+@stop
+
+@section('footer')
+
+
+@stop