ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix undefined $appendedText 

* Fixes https://github.com/Attendize/Attendize/issues/466
* Remove todo
This commit is contained in:
Sebastian Schmidt 2018-09-22 12:17:50 +10:00
parent 32acb9c4a0
commit d6c45ee8cf
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/EventCheckInController.php
View File

@ -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 = '<br><br><form class="ajax" action="' . $confirmOrderTicketsRoute . '" method="POST">' . csrf_field() . '<button class="btn btn-primary btn-sm" type="submit"><i class="ico-ticket"></i> Check in all tickets associated to this order</button></form>';
} 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])
]);
}
}