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

Merge remote-tracking branch 'Attendize/master'

This commit is contained in:
James Mowatt 2016-09-02 08:26:41 +01:00
parent 28a8bfe179 54c610881f
commit 4336042821
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/EventCheckoutController.php
View File

@ -59,6 +59,13 @@ class EventCheckoutController extends Controller
$event = Event::findOrFail($event_id);
if (!$request->has('tickets')) {
return response()->json([
'status' => 'error',
'message' => 'No tickets selected',
]);
}
$ticket_ids = $request->get('tickets');
/*

2
resources/views/ManageEvent/Customize.blade.php
View File

@ -491,7 +491,7 @@
</div>
<div class="form-group">
{!! Form::label('post_order_display_message', 'Message to display to attendees before after they have completed their order.', array('class'=>'control-label ')) !!}
{!! Form::label('post_order_display_message', 'Message to display to attendees after they have completed their order.', array('class'=>'control-label ')) !!}
{!! Form::textarea('post_order_display_message', $event->post_order_display_message, [
'class' => 'form-control',

2
resources/views/ManageEvent/Partials/EditEventForm.blade.php
View File

@ -98,7 +98,7 @@
{!! Form::label('location_post_code', 'Post Code', array('class'=>'control-label')) !!}
{!! Form::text('location_post_code', $event->location_post_code, [
'class'=>'form-control location_field',
'placeholder'=>'E.g: Dublin.'
'placeholder'=>'E.g: 94568.'
]) !!}
</div>
</div>