Merge pull request Attendize#184 from JapSeyz/fix_no_tickets_selected

Fix no tickets selected returns an exception
SamuelNitsche · Aug 29, 2016 · 54c6108 · 54c6108
2 parents 28a8bfe + 024cba5
commit 54c6108
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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');
 
         /*

diff --git 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
 
                     </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',

diff --git 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.'
                             ])  !!}
                     </div>
                 </div>