diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index b0197879..c124179b 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -93,9 +93,9 @@ class EventAttendeesController extends MyBaseController } return view('ManageEvent.Modals.CreateAttendee', [ - 'modal_id' => $request->get('modal_id'), - 'event' => $event, - 'tickets' => $event->tickets()->lists('title', 'id'), + 'modal_id' => $request->get('modal_id'), + 'event' => $event, + 'tickets' => $event->tickets()->lists('title', 'id'), ]); } @@ -195,11 +195,11 @@ class EventAttendeesController extends MyBaseController session()->flash('message', 'Attendee Successfully Created'); return response()->json([ - 'status' => 'success', - 'id' => $attendee->id, - 'redirectUrl' => route('showEventAttendees', [ - 'event_id' => $event_id, - ]), + 'status' => 'success', + 'id' => $attendee->id, + 'redirectUrl' => route('showEventAttendees', [ + 'event_id' => $event_id, + ]), ]); } @@ -288,8 +288,8 @@ class EventAttendeesController extends MyBaseController } return response()->json([ - 'status' => 'success', - 'message' => 'Message Successfully Sent', + 'status' => 'success', + 'message' => 'Message Successfully Sent', ]); } @@ -346,8 +346,8 @@ class EventAttendeesController extends MyBaseController */ return response()->json([ - 'status' => 'success', - 'message' => 'Message Successfully Sent', + 'status' => 'success', + 'message' => 'Message Successfully Sent', ]); } @@ -453,9 +453,9 @@ class EventAttendeesController extends MyBaseController session()->flash('message', 'Successfully Updated Attendee'); return response()->json([ - 'status' => 'success', - 'id' => $attendee->id, - 'redirectUrl' => '', + 'status' => 'success', + 'id' => $attendee->id, + 'redirectUrl' => '', ]); } @@ -521,9 +521,50 @@ class EventAttendeesController extends MyBaseController session()->flash('message', 'Successfully Cancelled Attenddee'); return response()->json([ - 'status' => 'success', - 'id' => $attendee->id, - 'redirectUrl' => '', + 'status' => 'success', + 'id' => $attendee->id, + 'redirectUrl' => '', + ]); + } + + /** + * Show the 'Message Attendee' modal + * + * @param Request $request + * @param $attendee_id + * @return View + */ + public function showResendTicketToAttendee(Request $request, $attendee_id) + { + $attendee = Attendee::scope()->findOrFail($attendee_id); + + $data = [ + 'attendee' => $attendee, + 'event' => $attendee->event, + 'modal_id' => $request->get('modal_id'), + ]; + + return view('ManageEvent.Modals.ResendTicketToAttendee', $data); + } + + /** + * Send a message to an attendee + * + * @param Request $request + * @param $attendee_id + * @return mixed + */ + public function postResendTicketToAttendee(Request $request, $attendee_id) + { + $attendee = Attendee::scope()->findOrFail($attendee_id); + + $order = $attendee->order; + + $this->dispatch(new OrderTicketsCommand($order, false)); + + return response()->json([ + 'status' => 'success', + 'message' => 'Ticket Successfully Resent', ]); } } diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 764c7b34..68b05946 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -1,34 +1,39 @@ findOrFail($event_id); $data['attendees'] = $data['event']->attendees; - return View::make('ManageEvent.CheckIn', $data); + return view('ManageEvent.CheckIn', $data); } - public function postCheckInSearch($event_id) + /** + * Search attendees + * + * @param Request $request + * @param $event_id + * @return \Illuminate\Http\JsonResponse + */ + public function postCheckInSearch(Request $request, $event_id) { - $searchQuery = Input::get('q'); + $searchQuery = $request->get('q'); $attendees = Attendee::scope()->withoutCancelled() ->join('tickets', 'tickets.id', '=', 'attendees.ticket_id') @@ -54,13 +59,19 @@ class EventCheckInController extends MyBaseController ->orderBy('attendees.first_name', 'ASC') ->get(); - return Response::json($attendees); + return response()->json($attendees); } - public function postCheckInAttendee() + /** + * Check in/out an attendee + * + * @param Request $request + * @return \Illuminate\Http\JsonResponse + */ + public function postCheckInAttendee(Request $request) { - $attendee_id = Input::get('attendee_id'); - $checking = Input::get('checking'); + $attendee_id = $request->get('attendee_id'); + $checking = $request->get('checking'); $attendee = Attendee::scope()->find($attendee_id); @@ -68,7 +79,7 @@ class EventCheckInController extends MyBaseController * Ugh */ if ((($checking == 'in') && ($attendee->has_arrived == 1)) || (($checking == 'out') && ($attendee->has_arrived == 0))) { - return Response::json([ + return response()->json([ 'status' => 'error', 'message' => 'Warning: This Attendee Has Already Been Checked '.(($checking == 'in') ? 'In (at '.$attendee->arrival_time->format('H:i A, F j').')' : 'Out').'!', 'checked' => $checking, @@ -80,7 +91,7 @@ class EventCheckInController extends MyBaseController $attendee->arrival_time = Carbon::now(); $attendee->save(); - return Response::json([ + return response()->json([ 'status' => 'success', 'checked' => $checking, 'message' => 'Attendee Successfully Checked '.(($checking == 'in') ? 'In' : 'Out'), diff --git a/app/Http/routes.php b/app/Http/routes.php index 7d5df373..378727f1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -422,6 +422,16 @@ Route::group(['middleware' => ['auth', 'first.run']], function () { 'uses' => 'EventAttendeesController@postMessageAttendee', ]); + Route::get('{event_id}/attendees/resend_ticket', [ + 'as' => 'showResendTicketToAttendee', + 'uses' => 'EventAttendeesController@showResendTicketToAttendee', + ]); + + Route::post('{event_id}/attendees/resend_ticket', [ + 'as' => 'postResendTicketToAttendee', + 'uses' => 'EventAttendeesController@postResendTicketToAttendee', + ]); + Route::get('{event_id}/attendees/create', [ 'as' => 'showCreateAttendee', 'uses' => 'EventAttendeesController@showCreateAttendee', diff --git a/app/Models/Attendee.php b/app/Models/Attendee.php index 2578d59c..cb59f9db 100644 --- a/app/Models/Attendee.php +++ b/app/Models/Attendee.php @@ -43,7 +43,7 @@ class Attendee extends MyBaseModel public function order() { - return$this->belongsTo('\App\Models\Order'); + return $this->belongsTo('\App\Models\Order'); } public function ticket() diff --git a/public/user_content/.gitignore b/public/user_content/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/public/user_content/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/resources/views/ManageEvent/Attendees.blade.php b/resources/views/ManageEvent/Attendees.blade.php index 116268f3..eb13952b 100644 --- a/resources/views/ManageEvent/Attendees.blade.php +++ b/resources/views/ManageEvent/Attendees.blade.php @@ -68,12 +68,10 @@ Attendees
@if($attendees->count())
-
- @@ -94,43 +92,51 @@ Attendees diff --git a/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php b/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php new file mode 100644 index 00000000..d6f3665d --- /dev/null +++ b/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/resources/views/Public/ViewEvent/Partials/EventFooterSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventFooterSection.blade.php index d0525e67..05007ff8 100644 --- a/resources/views/Public/ViewEvent/Partials/EventFooterSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventFooterSection.blade.php @@ -4,7 +4,7 @@
Ticketing By - Attendize + Attendize
diff --git a/storage/cache/.gitignore b/storage/cache/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/cache/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore
{!!Html::sortable_link('Name', $sort_by, 'first_name', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
{{{$attendee->full_name}}} - {{$attendee->email}} - {{{$attendee->ticket->title}}} + {{{$attendee->ticket->title}}} - + #{{$attendee->order->order_reference}} - @if($attendee->email) - Message - @endif +
+ + +
Edit Cancel