diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index dd0bef9c..3a022025 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -152,16 +152,18 @@ class PublicController extends Controller $lc = config('app.locale'); $events = Event::select('events.id',"events.title_{$lc}",'events.start_date','events.end_date',"events.description_{$lc}", - "venues.venue_name_{$lc} as venue_name","categories.title_{$lc} as category_title") + "venues.venue_name_{$lc} as venue_name","categories.title_{$lc} as category_title","organisers.name as organiser") ->join('venues','venues.id','=','events.venue_id') ->join('categories','categories.id','=','events.category_id') - ->withCount(['stats as views' => function($q){ - $q->select(DB::raw("SUM(views) as v"));}]) + ->join('organisers','organisers.id','=','events.organiser_id') +// ->withCount(['stats as views' => function($q){ +// $q->select(DB::raw("SUM(views) as v"));}]) ->onLive() ->where(function ($q) use($query){ $q->where('events.title_'.config('app.locale'),'like',"%{$query}%") ->orWhere('venues.venue_name_'.config('app.locale'),'like',"%{$query}%") - ->orWhere('categories.title_'.config('app.locale'),'like',"%{$query}%"); + ->orWhere('categories.title_'.config('app.locale'),'like',"%{$query}%") + ->orWhere('organisers.name','like',"%{$query}%"); }) ->paginate(12); diff --git a/resources/lang/en/ClientSide.php b/resources/lang/en/ClientSide.php index ec0ca5a3..7d8908d6 100644 --- a/resources/lang/en/ClientSide.php +++ b/resources/lang/en/ClientSide.php @@ -155,4 +155,5 @@ return [

В случае, если оплата прошла успешно, но билеты не пришли на почту, свяжитесь с нами.

', 'checkout_fail_button' => 'Contact us', 'redirect_payment_message' =>'Redirecting to payment gateway', + 'organiser' => 'Organiser', ]; diff --git a/resources/lang/ru/ClientSide.php b/resources/lang/ru/ClientSide.php index 4ae5cb4a..83312300 100644 --- a/resources/lang/ru/ClientSide.php +++ b/resources/lang/ru/ClientSide.php @@ -162,4 +162,5 @@ return [ 'redirect_payment_message' =>'Переход на страницу оплаты', 'search_result' => 'Результат поиска по', 'search_showing' => 'Видно на странице', + 'organiser' => 'Организатор', ]; diff --git a/resources/lang/tk/ClientSide.php b/resources/lang/tk/ClientSide.php index b8d5e41c..b0ecb3d9 100644 --- a/resources/lang/tk/ClientSide.php +++ b/resources/lang/tk/ClientSide.php @@ -167,4 +167,5 @@ sargydyňyz Bank tarapyndan ýatyrylandyr. Biletleri täzeden satyn almaga synan 'redirect_payment_message' =>'Töleg sahypasyna geçilýär', 'search_result' => 'Gözleg netijesi:', 'search_showing' => 'Sahypada görkezileni', + 'organiser' => 'Gurnaýjy', ]; diff --git a/resources/lang/tk/Ticket.php b/resources/lang/tk/Ticket.php index 0b292938..06235c7d 100644 --- a/resources/lang/tk/Ticket.php +++ b/resources/lang/tk/Ticket.php @@ -28,7 +28,7 @@ return array ( 'no_tickets_yet' => 'No Tickets Yet', 'no_tickets_yet_text' => 'Create your first ticket by clicking the button below.', 'order_ref' => 'Order Ref.', - 'organiser' => 'Organiser', + 'organiser' => 'Gurna', 'pause' => 'Pause', 'price' => 'Price', 'questions' => 'Questions', diff --git a/resources/views/desktop/Pages/EventsPage.blade.php b/resources/views/desktop/Pages/EventsPage.blade.php index 00ba3f57..0771c38d 100644 --- a/resources/views/desktop/Pages/EventsPage.blade.php +++ b/resources/views/desktop/Pages/EventsPage.blade.php @@ -39,3 +39,16 @@ @endforeach @endsection + +@section('after_scripts') + + +@endsection diff --git a/resources/views/desktop/Pages/SearchResults.blade.php b/resources/views/desktop/Pages/SearchResults.blade.php index 1ec54baa..1456bc34 100644 --- a/resources/views/desktop/Pages/SearchResults.blade.php +++ b/resources/views/desktop/Pages/SearchResults.blade.php @@ -29,7 +29,7 @@

{{$event->title}}

@lang('ClientSide.category'): {{$event->category_title}}
@lang('ClientSide.venue'): {{$event->venue_name}}
-
@lang('ClientSide.date'): {{$event->start_date->format('d.m.Y')}} - {{$event->end_date->format('d.m.Y')}}
+
@lang('ClientSide.organiser'): {{$event->organiser}}