Merge remote-tracking branch 'origin/bilettm' into bilettm

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);

resources/lang/en/ClientSide.php

@@ -155,4 +155,5 @@ return [
 <p>В случае, если оплата прошла успешно, но билеты не пришли на почту, свяжитесь с нами.</p>',
     'checkout_fail_button' => 'Contact us',
     'redirect_payment_message' =>'Redirecting to payment gateway',
+    'organiser' => 'Organiser',
 ];

resources/lang/ru/ClientSide.php

@@ -162,4 +162,5 @@ return [
     'redirect_payment_message' =>'Переход на страницу оплаты',
     'search_result' => 'Результат поиска по',
     'search_showing' => 'Видно на странице',
+    'organiser' => 'Организатор',
 ];

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',
 ];

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',

resources/views/desktop/Pages/EventsPage.blade.php

@@ -39,3 +39,16 @@
     @endforeach
 
 @endsection
+
+@section('after_scripts')
+    <script src="{{asset('vendor/gijgo/gijgo.min.js')}}" type="text/javascript"></script>
+    <script>
+        $('#datepicker').datepicker({
+            uiLibrary: 'bootstrap4',
+            icons: {
+                rightIcon: '{{__("ClientSide.date")}} <i class="fa fa-caret-down"></i>'
+            }
+        });
+
+    </script>
+@endsection

resources/views/desktop/Pages/SearchResults.blade.php

@@ -29,7 +29,7 @@
                                 <h4 class="film_name"><a href="{{$event->event_url}}">{{$event->title}}</a></h4>
                                 <h6 class="text-left"><b>@lang('ClientSide.category')</b>: {{$event->category_title}}</h6>
                                 <h6 class="text-left"><b>@lang('ClientSide.venue')</b>: {{$event->venue_name}}</h6>
-                                <h6 class="text-left"><b>@lang('ClientSide.date')</b>: {{$event->start_date->format('d.m.Y')}} - {{$event->end_date->format('d.m.Y')}}</h6>
+                                <h6 class="text-left"><b>@lang('ClientSide.organiser')</b>: {{$event->organiser}}</h6>
                             </div>
                         </div>
                     </div>