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

Merge pull request #226 from nbdd0121/master 

Two bugfixes
This commit is contained in:
Dave Earley 2016-10-26 21:17:21 +01:00 committed by GitHub
parent 581477fa21 28e124c6de
commit 09fa83c7ee
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EventTicketsController.php
View File

@ -44,8 +44,8 @@ class EventTicketsController extends MyBaseController
// Get tickets for event.
$tickets = empty($q) === false
? $event->tickets()->where('title', 'like', '%' . $q . '%')->orderBy($sort_by, 'desc')->paginate()
: $event->tickets()->orderBy($sort_by, 'desc')->paginate();
? $event->tickets()->where('title', 'like', '%' . $q . '%')->orderBy($sort_by, 'asc')->paginate()
: $event->tickets()->orderBy($sort_by, 'asc')->paginate();
// Return view.
return view('ManageEvent.Tickets', compact('event', 'tickets', 'sort_by', 'q', 'allowed_sorts'));

2
app/Http/Controllers/EventViewController.php
View File

@ -33,7 +33,7 @@ class EventViewController extends Controller
$data = [
'event' => $event,
'tickets' => $event->tickets()->where('is_hidden', 0)->orderBy('sort_order', 'desc')->get(),
'tickets' => $event->tickets()->where('is_hidden', 0)->orderBy('sort_order', 'asc')->get(),
'is_embedded' => 0,
];
/*

2
app/Http/Controllers/EventViewEmbeddedController.php
View File

@ -19,7 +19,7 @@ class EventViewEmbeddedController extends Controller
$data = [
'event' => $event,
'tickets' => $event->tickets()->where('is_hidden', 0)->orderBy('sort_order', 'desc')->get(),
'tickets' => $event->tickets()->where('is_hidden', 0)->orderBy('sort_order', 'asc')->get(),
'is_embedded' => '1',
];

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

@ -205,7 +205,7 @@
@if($event->pre_order_display_message)
<div class="well well-small">
{{ nl2br(e($event->pre_order_display_message)) }}
{!! nl2br(e($event->pre_order_display_message)) !!}
</div>
@endif