From d6c45ee8cfae2f78cf3ac2aa37a58c1762b02be1 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Sat, 22 Sep 2018 12:17:50 +1000 Subject: [PATCH] Fix undefined $appendedText * Fixes https://github.com/Attendize/Attendize/issues/466 * Remove todo --- .../Controllers/EventCheckInController.php | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 2cbcf94c..b2d4a5a6 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -19,7 +19,6 @@ class EventCheckInController extends MyBaseController */ public function showCheckIn($event_id) { - $event = Event::scope()->findOrFail($event_id); $data = [ @@ -59,8 +58,11 @@ class EventCheckInController extends MyBaseController $query->where('attendees.event_id', '=', $event_id); })->where(function ($query) use ($searchQuery) { $query->orWhere('attendees.first_name', 'like', $searchQuery . '%') - ->orWhere(DB::raw("CONCAT_WS(' ', attendees.first_name, attendees.last_name)"), 'like', - $searchQuery . '%') + ->orWhere( + DB::raw("CONCAT_WS(' ', attendees.first_name, attendees.last_name)"), + 'like', + $searchQuery . '%' + ) //->orWhere('attendees.email', 'like', $searchQuery . '%') ->orWhere('orders.order_reference', 'like', $searchQuery . '%') ->orWhere('attendees.last_name', 'like', $searchQuery . '%'); @@ -165,19 +167,12 @@ class EventCheckInController extends MyBaseController if ($relatedAttendesCount >= 1) { $confirmOrderTicketsRoute = route('confirmCheckInOrderTickets', [$event->id, $attendee->order_id]); - - /* - * @todo Incorporate this feature into the new design - */ - //$appendedText = '

' . csrf_field() . '
'; - } else { - $appendedText = ''; } if ($attendee->has_arrived) { return response()->json([ 'status' => 'error', - 'message' => trans("Controllers.attendee_already_checked_in", ["time"=> $attendee->arrival_time->format(env("DEFAULT_DATETIME_FORMAT"))]) . $appendedText + 'message' => trans("Controllers.attendee_already_checked_in", ["time"=> $attendee->arrival_time->format(env("DEFAULT_DATETIME_FORMAT"))]) ]); } @@ -185,7 +180,7 @@ class EventCheckInController extends MyBaseController return response()->json([ 'status' => 'success', - 'message' => trans("Controllers.attendee_check_in_success", ["name"=>$attendee->first_name." ".$attendee->last_name, "ref"=>$attendee->reference, "ticket"=>$attendee->ticket]).$appendedText + 'message' => trans("Controllers.attendee_check_in_success", ["name"=>$attendee->first_name." ".$attendee->last_name, "ref"=>$attendee->reference, "ticket"=>$attendee->ticket]) ]); } @@ -211,5 +206,4 @@ class EventCheckInController extends MyBaseController 'message' => trans("Controllers.num_attendees_checked_in", ["num"=>$updateRowsCount]) ]); } - }