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

- L5 updates 

- Minor Changes
This commit is contained in:
Dave 2016-03-11 12:04:09 +00:00
parent db91c48e7f 461c6132b2
commit 5be206aaa3
9 changed files with 153 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/Http/Controllers/EventAttendeesController.php
View File

@ -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',
]);
}
}

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

@ -1,34 +1,39 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Attendee;
use App\Models\Event;
use Carbon\Carbon;
use DB;
use Input;
use Response;
use View;
class EventCheckInController extends MyBaseController
{
/**
* @param $event_id
* Show the check-in page
*
* @return mixed
* @param $event_id
* @return \Illuminate\View\View
*/
public function showCheckIn($event_id)
{
$data['event'] = Event::scope()->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'),

10
app/Http/routes.php
View File

@ -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',

2
app/Models/Attendee.php
View File

@ -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()

2
public/user_content/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore

50
resources/views/ManageEvent/Attendees.blade.php
View File

@ -68,12 +68,10 @@ Attendees
<div class="col-md-12">
@if($attendees->count())
<div class="panel">
<div class="table-responsive">
<table class="table " >
<thead>
<tr>
<!-- <th width="5%"></th>-->
<th>
{!!Html::sortable_link('Name', $sort_by, 'first_name', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
</th>
@ -94,43 +92,51 @@ Attendees
<tr class="attendee_{{$attendee->id}} {{$attendee->is_cancelled ? 'danger' : ''}}">
<td>{{{$attendee->full_name}}}</td>
<td>
<a
data-modal-id='MessageAttendee'
href='javascript:void(0);'
<a data-modal-id="MessageAttendee" href="javascript:void(0);" class="loadModal"
data-href="{{route('showMessageAttendee', ['attendee_id'=>$attendee->id])}}"
class='loadModal '
> {{$attendee->email}}</a>
</td>
<td>
{{{$attendee->ticket->title}}}
{{{$attendee->ticket->title}}}
</td>
<td>
<a href='javascript:void(0);' data-modal-id='view-order-{{ $attendee->order->id }}' data-href="{{route('showManageOrder', ['order_id'=>$attendee->order->id])}}" title="View Order #{{$attendee->order->order_reference}}" class="loadModal">
<a href="javascript:void(0);" data-modal-id="view-order-{{ $attendee->order->id }}" data-href="{{route('showManageOrder', ['order_id'=>$attendee->order->id])}}" title="View Order #{{$attendee->order->order_reference}}" class="loadModal">
#{{$attendee->order->order_reference}}
</a>
</td>
<td class="text-center">
@if($attendee->email)
<a
data-modal-id='MessageAttendee'
href='javascript:void(0);'
data-href="{{route('showMessageAttendee', ['attendee_id'=>$attendee->id])}}"
class='loadModal btn btn-xs btn-primary'
> Message</a>
@endif
<div class="btn-group">
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Action <span class="caret"></span></button>
<ul class="dropdown-menu">
@if($attendee->email)
<li><a
data-modal-id="MessageAttendee"
href="javascript:void(0);"
data-href="{{route('showMessageAttendee', ['attendee_id'=>$attendee->id])}}"
class="loadModal"
> Message</a></li>
@endif
<li><a
data-modal-id="ResendTicketToAttendee"
href="javascript:void(0);"
data-href="{{route('showResendTicketToAttendee', ['attendee_id'=>$attendee->id])}}"
class="loadModal"
> Resend Ticket</a></li>
</ul>
</div>
<a
data-modal-id='EditAttendee'
href='javascript:void(0);'
data-modal-id="EditAttendee"
href="javascript:void(0);"
data-href="{{route('showEditAttendee', ['event_id'=>$event->id, 'attendee_id'=>$attendee->id])}}"
class='loadModal btn btn-xs btn-primary'
class="loadModal btn btn-xs btn-primary"
> Edit</a>
<a
data-modal-id='CancelAttendee'
href='javascript:void(0);'
data-modal-id="CancelAttendee"
href="javascript:void(0);"
data-href="{{route('showCancelAttendee', ['event_id'=>$event->id, 'attendee_id'=>$attendee->id])}}"
class='loadModal btn btn-xs btn-danger'
class="loadModal btn btn-xs btn-danger"
> Cancel</a>
</td>
</tr>

24
resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php Normal file
View File

@ -0,0 +1,24 @@
<div role="dialog" id="{{$modal_id}}" class="modal fade" style="display: none;">
{!! Form::open(array('url' => route('postResendTicketToAttendee', array('attendee_id' => $attendee->id)), 'class' => 'ajax reset closeModalAfter')) !!}
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header text-center">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-envelope"></i>
Resend Ticket to {{{$attendee->full_name}}}
</h3>
</div>
<div class="modal-body">
<div class="help-block">
The attendee will be sent another copy of their ticket to <b>{{$attendee->event->organiser->email}}</b>
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">
{!! Form::button('Cancel', ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}
{!! Form::submit('Send Ticket', ['class'=>"btn btn-success"]) !!}
</div>
</div><!-- /end modal content-->
{!! Form::close() !!}
</div>
</div>

2
resources/views/Public/ViewEvent/Partials/EventFooterSection.blade.php
View File

@ -4,7 +4,7 @@
<div class="col-md-12">
Ticketing By
<a href="/">
<a href="https://attendize.com?utm_source=event_page">Attend<b>ize</b></a>
<a href="https://www.attendize.com">Attend<b>ize</b></a>
</a>
</div>
</div>

2
storage/cache/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore