diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index b8eb8cc9..82f0568b 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -77,8 +77,12 @@ class PublicController extends Controller // get all live events belong to sub categories if($category->children->count()){ + $sub_cat = $category->children->pop(); + $sub_cats_events = $sub_cat->cat_events() - $sub_cats_events = Event::query(); + ->onLive($data['start'],$data['end']) + ->orderBy($order['field'],$order['order']) + ->take($sub_cat->events_limit); foreach ($category->children as $sub_cat){ @@ -91,9 +95,7 @@ class PublicController extends Controller } dd($sub_cats_events->get()); - if($sub_cats_events) - $data['events'] = $sub_cats_events->get(); - + $data['events'] = $sub_cats_events->get(); } return $this->render("Pages.EventsPage",$data);