From cecf9899e6f68a5ba9bacd66aad868e0cbc0314e Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Mon, 9 Dec 2019 16:31:30 +0500
Subject: [PATCH] attendees

---
 .../Bilettm/ViewEvent/Partials/Schedule.blade.php  | 11 +++++------
 resources/views/ManageEvent/Attendees.blade.php    | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php
index eab96af3..fcfed562 100644
--- a/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php
+++ b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php
@@ -1,14 +1,13 @@
-<h2 class="main-title" style="padding-left: 5px">Расписание</h2>
-<div class="main-title-bottom-line" style="margin-left: 5px"></div>
-@if($event->end_date->isPast())
+@if(count($ticket_dates) > 0)
+    <h2 class="main-title" style="padding-left: 5px">Расписание</h2>
+    <div class="main-title-bottom-line" style="margin-left: 5px"></div>
+    @if($event->end_date->isPast())
     <div class="alert alert-boring">
         <h4 class="date-small-title">
             @lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')])
         </h4>
     </div>
-@else
-    @if(count($ticket_dates) > 0)
-
+    @else
         <h4 class="date-small-title">Дата проведения</h4>
         <div class="date-box-wrap">
             <ul class="nav nav-pills details-page">
diff --git a/resources/views/ManageEvent/Attendees.blade.php b/resources/views/ManageEvent/Attendees.blade.php
index 915a096b..c6b29694 100644
--- a/resources/views/ManageEvent/Attendees.blade.php
+++ b/resources/views/ManageEvent/Attendees.blade.php
@@ -31,11 +31,11 @@
         <div class="btn-group btn-group-responsive">
             <button data-modal-id="InviteAttendee" href="javascript:void(0);"  data-href="{{route('showInviteAttendee', ['event_id'=>$event->id])}}" class="loadModal btn btn-success" type="button"><i class="ico-user-plus"></i> @lang("ManageEvent.invite_attendee")</button>
         </div>
-        
+
         <div class="btn-group btn-group-responsive">
             <button data-modal-id="ImportAttendees" href="javascript:void(0);"  data-href="{{route('showImportAttendee', ['event_id'=>$event->id])}}" class="loadModal btn btn-success" type="button"><i class="ico-file"></i> @lang("ManageEvent.invite_attendees")</button>
         </div>
-        
+
         <div class="btn-group btn-group-responsive">
             <a class="btn btn-success" href="{{route('showPrintAttendees', ['event_id'=>$event->id])}}" target="_blank" ><i class="ico-print"></i> @lang("ManageEvent.print_attendee_list")</a>
         </div>
@@ -88,6 +88,12 @@
                             <th>
                                {!!Html::sortable_link(trans("ManageEvent.ticket"), $sort_by, 'ticket_id', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
                             </th>
+                            <th>
+                               {!!Html::sortable_link(trans("ManageEvent.ticket_date"), $sort_by, 'ticket_date', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
+                            </th>
+                            <th>
+                               {!!Html::sortable_link(trans("ManageEvent.seat"), $sort_by, 'seat_no', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
+                            </th>
                             <th>
                                {!!Html::sortable_link(trans("Order.order_ref"), $sort_by, 'order_reference', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!}
                             </th>
@@ -106,6 +112,10 @@
                             <td>
                                 {{{$attendee->ticket->title}}}
                             </td>
+                            <td>
+                                {{$attendee->ticket->ticket_date}}
+                            </td>
+                            <td>{{$attendee->seat_no}}</td>
                             <td>
                                 <a href="javascript:void(0);" data-modal-id="view-order-{{ $attendee->order->id }}" data-href="{{route('showManageOrder', ['order_id'=>$attendee->order->id])}}" title="View Order #{{$attendee->order->order_reference}}" class="loadModal">
                                     {{$attendee->order->order_reference}}