Merge pull request playasoft#189 from Tompiosh/master

Updated shift confirmation email

laravel/app/Listeners/SendUserShiftConfirmation.php

@@ -34,9 +34,9 @@ public function handle(SlotChanged $event)
             $user_name = $event->change['name'];
             $event_name = $event->slot->schedule->shift->event->name;
             $shift_name = $event->slot->schedule->shift->name;
-            $start_date = $event->slot->start_date;
-            $start_time = $event->slot->start_date;
-            $end_time = $event->slot->end_time;
+            $start_date = date('l M d',strtotime($event->slot->start_date));
+            $start_time = date('h:i a',strtotime($event->slot->start_time . $event->slot->start_date));
+            $end_time = date('h:i a',strtotime($event->slot->end_time . $event->slot->start_date));
 
             $admin_assigned = false;
             if (isset($event->change['admin_assigned']))

laravel/resources/views/emails/user-shift-confirmation.blade.php

@@ -1,27 +1,13 @@
-<h1>You're signed up for the {{ $shift_name }} shift!</h1>
-
-@if ($admin_assigned)
+<h1>You're signed up for a {{ $shift_name }} shift at {{ $event_name }}!</h1>
 <p>
-   This is a confirmation email for the {{ $shift_name }} shift
-   that you were recently assigned to for the {{ $event_name }} event.
+    Your shift will take place on {{ $start_date}} between {{ $start_time }} and {{ $end_time }}.
 </p>
-@else
 <p>
-   This is a confirmation email for the {{ $shift_name }} shift
-   you recently picked up for the {{ $shift_name }} event.
+    For volunteer ticketing information, please visit the {{ $event_name }} ticketing webpage. 
 </p>
-@endif
-
 <p>
-    This shift takes place on {{ $start_date}} between the times of
-    {{ $start_time }} and {{ $end_time }}.
+    If you did NOT sign up for this shift or would like to CANCEL this shift, <a href="{{ env('SITE_URL').'/slot/'.$slot->id.'/view' }}">click here</a>.
 </p>
-
-<p>
-    If you did <b>NOT</b> sign-up for this shift or would like to <b>CANCEL</b> this
-    shift, <a href="{{ env('SITE_URL').'/slot/'.$slot->id.'/view' }}">click here</a>.
-</p>
-
 <p>
     Otherwise, we look forward to seeing you there!
 </p>