From 041d3b1ac1f73148bbb18beba3472a9ae731760d Mon Sep 17 00:00:00 2001 From: Tompiosh <61041765+Tompiosh@users.noreply.github.com> Date: Thu, 20 Feb 2020 01:08:37 -0700 Subject: [PATCH 1/3] changed timestamp format of start_date, start_time, end_time for email confirmation --- laravel/app/Listeners/SendUserShiftConfirmation.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/laravel/app/Listeners/SendUserShiftConfirmation.php b/laravel/app/Listeners/SendUserShiftConfirmation.php index bf432953..ddc592ef 100644 --- a/laravel/app/Listeners/SendUserShiftConfirmation.php +++ b/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'])) From bcb2b379a008c423b2f40638040a682ab763eb0c Mon Sep 17 00:00:00 2001 From: Tompiosh <61041765+Tompiosh@users.noreply.github.com> Date: Thu, 20 Feb 2020 01:10:20 -0700 Subject: [PATCH 2/3] Updated shift confirmation email phrasing --- .../emails/user-shift-confirmation.blade.php | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/laravel/resources/views/emails/user-shift-confirmation.blade.php b/laravel/resources/views/emails/user-shift-confirmation.blade.php index a44675c3..91cfc701 100644 --- a/laravel/resources/views/emails/user-shift-confirmation.blade.php +++ b/laravel/resources/views/emails/user-shift-confirmation.blade.php @@ -1,27 +1,10 @@ -

You're signed up for the {{ $shift_name }} shift!

- -@if ($admin_assigned) +

You're signed up for a {{ $shift_name }} shift at {{ $event_name }}!

- 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 }}.

-@else

- This is a confirmation email for the {{ $shift_name }} shift - you recently picked up for the {{ $shift_name }} event. + If you did NOT sign up for this shift or would like to CANCEL this shift, click here.

-@endif - -

- 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, click here. -

-

Otherwise, we look forward to seeing you there!

From 41e132cacdf018371ce2497ad2cbd4550f88d3a0 Mon Sep 17 00:00:00 2001 From: Tompiosh <61041765+Tompiosh@users.noreply.github.com> Date: Fri, 21 Feb 2020 18:38:31 -0700 Subject: [PATCH 3/3] added more information text --- .../resources/views/emails/user-shift-confirmation.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/laravel/resources/views/emails/user-shift-confirmation.blade.php b/laravel/resources/views/emails/user-shift-confirmation.blade.php index 91cfc701..57bfe354 100644 --- a/laravel/resources/views/emails/user-shift-confirmation.blade.php +++ b/laravel/resources/views/emails/user-shift-confirmation.blade.php @@ -2,6 +2,9 @@

Your shift will take place on {{ $start_date}} between {{ $start_time }} and {{ $end_time }}.

+

+ For volunteer ticketing information, please visit the {{ $event_name }} ticketing webpage. +

If you did NOT sign up for this shift or would like to CANCEL this shift, click here.