From 28e124c6deed1898e4fbf4457f43b00ae39c6d37 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Sun, 23 Oct 2016 19:52:40 -0400 Subject: [PATCH] Make tickets be sorted in ASC order In EventTicketsController::postUpdateTicketsOrder, sort_order is generated in ascending order, however, when displaying tickets, tickets is sorted in descending order. 964e456 tries to solve the issue but it is the other way around. --- app/Http/Controllers/EventTicketsController.php | 4 ++-- app/Http/Controllers/EventViewController.php | 2 +- app/Http/Controllers/EventViewEmbeddedController.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php index 1e63e8c3..cefc8b88 100644 --- a/app/Http/Controllers/EventTicketsController.php +++ b/app/Http/Controllers/EventTicketsController.php @@ -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')); diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index 17be6798..fac01cc0 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -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, ]; /* diff --git a/app/Http/Controllers/EventViewEmbeddedController.php b/app/Http/Controllers/EventViewEmbeddedController.php index eab2a4bf..99bc26a1 100644 --- a/app/Http/Controllers/EventViewEmbeddedController.php +++ b/app/Http/Controllers/EventViewEmbeddedController.php @@ -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', ];