From e881e7ede16646a54ebd25ec5fe754d156c964b2 Mon Sep 17 00:00:00 2001 From: JapSeyz Date: Mon, 29 Aug 2016 13:25:49 +0200 Subject: [PATCH 1/2] Fix no tickets selected returns an exception --- app/Http/Controllers/EventCheckoutController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 3eb0a492e..09529fe27 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -59,6 +59,13 @@ public function postValidateTickets(Request $request, $event_id) $event = Event::findOrFail($event_id); + if (!$request->has('tickets')) { + return response()->json([ + 'status' => 'error', + 'message' => 'No tickets selected', + ]); + } + $ticket_ids = $request->get('tickets'); /* From 024cba5bda89ef8df63709d8a3fe22b9cacc2edd Mon Sep 17 00:00:00 2001 From: JapSeyz Date: Mon, 29 Aug 2016 13:30:56 +0200 Subject: [PATCH 2/2] Text fixes --- resources/views/ManageEvent/Customize.blade.php | 2 +- resources/views/ManageEvent/Partials/EditEventForm.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php index a34e413fd..028a1e667 100644 --- a/resources/views/ManageEvent/Customize.blade.php +++ b/resources/views/ManageEvent/Customize.blade.php @@ -491,7 +491,7 @@ class="img-thumbnail ma5 bgImage {{ ($bg_image === str_replace('/thumbs', '', $e
- {!! 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', diff --git a/resources/views/ManageEvent/Partials/EditEventForm.blade.php b/resources/views/ManageEvent/Partials/EditEventForm.blade.php index c63e251a3..be34a3668 100644 --- a/resources/views/ManageEvent/Partials/EditEventForm.blade.php +++ b/resources/views/ManageEvent/Partials/EditEventForm.blade.php @@ -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.' ]) !!}