From 5ce0711da3e28a7856c7bf6851c153e8ea92f3a3 Mon Sep 17 00:00:00 2001 From: Yoann Lecuyer Date: Sun, 29 May 2016 12:03:18 -0500 Subject: [PATCH] Change create attendee to invite --- .gitignore | 3 +- .../Controllers/EventAttendeesController.php | 32 ++++++++----------- app/Http/routes.php | 12 +++---- app/Mailers/TicketMailer.php | 20 ++++++++++++ .../TicketMailer/SendAttendeeInvite.blade.php | 11 +++++++ .../TicketMailer/SendAttendeeTicket.blade.php | 1 - .../views/ManageEvent/Attendees.blade.php | 4 +-- .../Modals/ImportAttendee.blade.php | 15 ++------- ...dee.blade.php => InviteAttendee.blade.php} | 19 +++-------- .../Partials/AttendeesBlankSlate.blade.php | 8 ++--- 10 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php rename resources/views/ManageEvent/Modals/{CreateAttendee.blade.php => InviteAttendee.blade.php} (79%) diff --git a/.gitignore b/.gitignore index 66f097c0..0d41cbc4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ installed /.project /.buildpath /composer.phar -_ide_helper.php \ No newline at end of file +_ide_helper.php +*.swp diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index 69f94bd7..00a8c91a 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -75,13 +75,13 @@ class EventAttendeesController extends MyBaseController } /** - * Show the 'Create Attendee' modal + * Show the 'Invite Attendee' modal * * @param Request $request * @param $event_id * @return string|View */ - public function showCreateAttendee(Request $request, $event_id) + public function showInviteAttendee(Request $request, $event_id) { $event = Event::scope()->find($event_id); @@ -90,28 +90,27 @@ class EventAttendeesController extends MyBaseController * @todo This is a bit hackish */ if ($event->tickets->count() === 0) { - return ''; + return ''; } - return view('ManageEvent.Modals.CreateAttendee', [ + return view('ManageEvent.Modals.InviteAttendee', [ 'event' => $event, 'tickets' => $event->tickets()->lists('title', 'id'), ]); } /** - * Create an attendee + * Invite an attendee * * @param Request $request * @param $event_id * @return mixed */ - public function postCreateAttendee(Request $request, $event_id) + public function postInviteAttendee(Request $request, $event_id) { $rules = [ 'first_name' => 'required', 'ticket_id' => 'required|exists:tickets,id,account_id,' . \Auth::user()->account_id, - 'ticket_price' => 'numeric|required', 'email' => 'email|required', ]; @@ -130,7 +129,7 @@ class EventAttendeesController extends MyBaseController } $ticket_id = $request->get('ticket_id'); - $ticket_price = $request->get('ticket_price'); + $ticket_price = 0; $attendee_first_name = $request->get('first_name'); $attendee_last_name = $request->get('last_name'); $attendee_email = $request->get('email'); @@ -195,10 +194,10 @@ class EventAttendeesController extends MyBaseController $this->dispatch(new GenerateTicket($order->order_reference."-".$attendee->reference_index)); if ($email_attendee == '1') { - TicketMailer::sendAttendeeTicket($attendee); + TicketMailer::sendAttendeeInvite($attendee); } - session()->flash('message', 'Attendee Successfully Created'); + session()->flash('message', 'Attendee Successfully Invited'); DB::commit(); @@ -216,7 +215,7 @@ class EventAttendeesController extends MyBaseController return response()->json([ 'status' => 'error', - 'error' => 'An error occurred while creating this attendee. Please try again.' + 'error' => 'An error occurred while inviting this attendee. Please try again.' ]); } @@ -259,7 +258,6 @@ class EventAttendeesController extends MyBaseController { $rules = [ 'ticket_id' => 'required|exists:tickets,id,account_id,' . \Auth::user()->account_id, - 'ticket_price' => 'numeric', 'attendees_list' => 'required|mimes:csv,txt|max:5000|', ]; @@ -277,10 +275,7 @@ class EventAttendeesController extends MyBaseController } $ticket_id = $request->get('ticket_id'); - $ticket_price = $request->get('ticket_price'); - if ($request->get('ticket_price') == null) { - $ticket_price = 0; - } + $ticket_price = 0; $email_attendee = $request->get('email_ticket'); $num_added = 0; if ($request->file('attendees_list')) { @@ -311,6 +306,7 @@ class EventAttendeesController extends MyBaseController $order->account_id = Auth::user()->account_id; $order->event_id = $event_id; $order->save(); + /** * Update qty sold */ @@ -352,13 +348,13 @@ class EventAttendeesController extends MyBaseController $this->dispatch(new GenerateTicket($attendee->getReferenceAttribute())); if ($email_attendee == '1') { - TicketMailer::sendAttendeeTicket($attendee); + TicketMailer::sendAttendeeInvite($attendee); } } }; } - session()->flash('message', $num_added . ' Attendees Successfully Created'); + session()->flash('message', $num_added . ' Attendees Successfully Invited'); return response()->json([ 'status' => 'success', diff --git a/app/Http/routes.php b/app/Http/routes.php index ab3ceb7b..0bcd3ff5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -413,14 +413,14 @@ Route::group(['middleware' => ['auth', 'first.run']], function () { 'uses' => 'EventAttendeesController@postResendTicketToAttendee', ]); - Route::get('{event_id}/attendees/create', [ - 'as' => 'showCreateAttendee', - 'uses' => 'EventAttendeesController@showCreateAttendee', + Route::get('{event_id}/attendees/invite', [ + 'as' => 'showInviteAttendee', + 'uses' => 'EventAttendeesController@showInviteAttendee', ]); - Route::post('{event_id}/attendees/create', [ - 'as' => 'postCreateAttendee', - 'uses' => 'EventAttendeesController@postCreateAttendee', + Route::post('{event_id}/attendees/invite', [ + 'as' => 'postInviteAttendee', + 'uses' => 'EventAttendeesController@postInviteAttendee', ]); Route::get('{event_id}/attendees/import', [ diff --git a/app/Mailers/TicketMailer.php b/app/Mailers/TicketMailer.php index 52233a9b..d275bc30 100644 --- a/app/Mailers/TicketMailer.php +++ b/app/Mailers/TicketMailer.php @@ -48,4 +48,24 @@ class TicketMailer } + public static function sendAttendeeInvite($attendee) { + + Log::info("Sending invite to: ".$attendee->email); + + $data = [ + 'attendee' => $attendee, + ]; + + Mail::queue('Mailers.TicketMailer.SendAttendeeInvite', $data, function($message) use ($attendee) { + $message->to($attendee->email); + $message->subject('Your ticket for the event '.$attendee->order->event->title); + + $file_name = $attendee->getReferenceAttribute(); + $file_path = public_path(config('attendize.event_pdf_tickets_path')).'/'.$file_name.'.pdf'; + + $message->attach($file_path); + }); + + } + } diff --git a/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php b/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php new file mode 100644 index 00000000..f6aae270 --- /dev/null +++ b/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php @@ -0,0 +1,11 @@ +@extends('Emails.Layouts.Master') + +@section('message_content') +Hello {{$attendee->first_name}},

+ +You have been invited to the event {{$attendee->order->event->title}}.
+Your ticket for the event is attached to this email. + +

+Regards +@stop diff --git a/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php b/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php index d186164e..0a3186ed 100644 --- a/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php +++ b/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php @@ -5,7 +5,6 @@ Hello {{$attendee->first_name}},

Your ticket for the event {{$attendee->order->event->title}} is attached to this email. -

Thank you @stop diff --git a/resources/views/ManageEvent/Attendees.blade.php b/resources/views/ManageEvent/Attendees.blade.php index a5ff99a0..c5768fd1 100644 --- a/resources/views/ManageEvent/Attendees.blade.php +++ b/resources/views/ManageEvent/Attendees.blade.php @@ -29,11 +29,11 @@ Attendees
@@ -45,7 +34,7 @@
- +
diff --git a/resources/views/ManageEvent/Modals/CreateAttendee.blade.php b/resources/views/ManageEvent/Modals/InviteAttendee.blade.php similarity index 79% rename from resources/views/ManageEvent/Modals/CreateAttendee.blade.php rename to resources/views/ManageEvent/Modals/InviteAttendee.blade.php index fdaf72e9..e9c52a35 100644 --- a/resources/views/ManageEvent/Modals/CreateAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/InviteAttendee.blade.php @@ -1,12 +1,12 @@ {!! Form::close() !!} diff --git a/resources/views/ManageEvent/Partials/AttendeesBlankSlate.blade.php b/resources/views/ManageEvent/Partials/AttendeesBlankSlate.blade.php index 29ca2f11..74245ba4 100644 --- a/resources/views/ManageEvent/Partials/AttendeesBlankSlate.blade.php +++ b/resources/views/ManageEvent/Partials/AttendeesBlankSlate.blade.php @@ -10,13 +10,13 @@ @stop @section('blankslate-text') - Attendees will appear here once they successfully registered for your event, or, you can manually add attendees yourself. + Attendees will appear here once they successfully registered for your event, or, you can manually invite attendees yourself. @stop @section('blankslate-body') - @stop