From bc456b41815c7b465ff5a438e02eca0d939e7694 Mon Sep 17 00:00:00 2001 From: merdiano Date: Sat, 24 Aug 2019 15:30:23 +0500 Subject: [PATCH] added event ticket date to tickets --- .../Controllers/EventTicketsController.php | 7 ++- app/Models/Ticket.php | 7 +-- resources/lang/en/ManageEvent.php | 1 + .../Bilettm/Partials/TicketSchedule.blade.php | 43 +++++++++++++++++++ .../Bilettm/ViewEvent/EventPage.blade.php | 35 ++++----------- .../ManageEvent/Modals/CreateTicket.blade.php | 18 +++++++- .../ManageEvent/Modals/EditTicket.blade.php | 25 ++++++++--- .../views/Shared/Layouts/Master.blade.php | 11 +---- 8 files changed, 96 insertions(+), 51 deletions(-) create mode 100644 resources/views/Bilettm/Partials/TicketSchedule.blade.php diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php index a8964199..e2e127f6 100644 --- a/app/Http/Controllers/EventTicketsController.php +++ b/app/Http/Controllers/EventTicketsController.php @@ -37,10 +37,7 @@ class EventTicketsController extends MyBaseController } // Find event or return 404 error. - $event = Event::scope()->find($event_id); - if ($event === null) { - abort(404); - } + $event = Event::scope()->findOrFail($event_id); // Get tickets for event. $tickets = empty($q) === false @@ -101,6 +98,7 @@ class EventTicketsController extends MyBaseController $ticket->event_id = $event_id; $ticket->title = strip_tags($request->get('title')); $ticket->quantity_available = !$request->get('quantity_available') ? null : $request->get('quantity_available'); + $ticket->ticket_date = $request->get('ticket_date'); $ticket->start_sale_date = $request->get('start_sale_date'); $ticket->end_sale_date = $request->get('end_sale_date'); $ticket->price = $request->get('price'); @@ -226,6 +224,7 @@ class EventTicketsController extends MyBaseController $ticket->title = $request->get('title'); $ticket->quantity_available = !$request->get('quantity_available') ? null : $request->get('quantity_available'); $ticket->price = $request->get('price'); + $ticket->ticket_date = $request->get('ticket_date'); $ticket->start_sale_date = $request->get('start_sale_date'); $ticket->end_sale_date = $request->get('end_sale_date'); $ticket->description = $request->get('description'); diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 5e4808fc..781b62c7 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -10,7 +10,7 @@ class Ticket extends MyBaseModel { use SoftDeletes; - protected $dates = ['start_sale_date', 'end_sale_date']; + protected $dates = ['start_sale_date', 'end_sale_date','ticket_date']; /** * The rules to validate the model. @@ -24,8 +24,9 @@ class Ticket extends MyBaseModel 'title' => 'required', 'price' => 'required|numeric|min:0', 'description' => '', - 'start_sale_date' => 'date_format:"'.$format.'"', - 'end_sale_date' => 'date_format:"'.$format.'"|after:start_sale_date', + 'ticket_date' => 'required|date_format:"'.$format.'"', + 'start_sale_date' => 'date_format:"'.$format.'"|before:ticket_date', + 'end_sale_date' => 'date_format:"'.$format.'"|after:start_sale_date|before:ticket_date', 'quantity_available' => 'integer|min:'.($this->quantity_sold + $this->quantity_reserved) ]; } diff --git a/resources/lang/en/ManageEvent.php b/resources/lang/en/ManageEvent.php index 1ccae0a0..be014455 100644 --- a/resources/lang/en/ManageEvent.php +++ b/resources/lang/en/ManageEvent.php @@ -90,6 +90,7 @@ return array ( 'ticket_price' => 'Ticket Price', 'ticket_title' => 'Ticket Title', 'ticket_title_placeholder' => 'E.g: General Admission', + 'ticket_date' => 'Ticket Date', 'update_order' => 'Update Order', 'widgets' => 'Widgets', 'LLH:obsolete' => diff --git a/resources/views/Bilettm/Partials/TicketSchedule.blade.php b/resources/views/Bilettm/Partials/TicketSchedule.blade.php new file mode 100644 index 00000000..f5dcab87 --- /dev/null +++ b/resources/views/Bilettm/Partials/TicketSchedule.blade.php @@ -0,0 +1,43 @@ +
+ +

Расписание

+ @if($event->end_date->isPast()) +
+ @lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')]) +
+ @else + @if($tickets->count() > 0) +
+

Дата проведения

+
+ 10.07.2019 + 20.07.2019 +
+

Время проведения

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+ @else + +
+ @lang("Public_ViewEvent.tickets_are_currently_unavailable") +
+ @endif + @endif +
\ No newline at end of file diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 73587e70..92a1920c 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -18,38 +18,19 @@ {{----}} @endif {!! Markdown::parse($event->description) !!} + {{$event->organiser->name}} @lang("Public_ViewEvent.presents") + @lang("Public_ViewEvent.at") + + {{$event->venue_name}} + + -
-

Расписание

-
-

Дата проведения

-
- 10.07.2019 - 20.07.2019 -
-

Время проведения

-
-
-
- - -
-
- - -
-
- - -
-
-
-
+ @include('Bilettm.Partials.TicketSchedule')
- Купить билет + @include('Bilettm.Partials.EventShareButtons')
diff --git a/resources/views/ManageEvent/Modals/CreateTicket.blade.php b/resources/views/ManageEvent/Modals/CreateTicket.blade.php index 0f4150f1..0ddd05d7 100644 --- a/resources/views/ManageEvent/Modals/CreateTicket.blade.php +++ b/resources/views/ManageEvent/Modals/CreateTicket.blade.php @@ -21,7 +21,21 @@
-
+
+
+ {!! Form::label('ticket_date', trans("ManageEvent.ticket_date"), array('class'=>' control-label required')) !!} + + {!! Form::text('ticket_date', Input::old('ticket_date'), + [ + 'class' => 'form-control start hasDatepicker', + 'data-field' => 'datetime', + 'data-startend' => 'start', + 'data-startendelem' => '.end', + 'readonly' => '' + ]) !!} +
+
+
{!! Form::label('price', trans("ManageEvent.ticket_price"), array('class'=>'control-label required')) !!} {!! Form::text('price', Input::old('price'), @@ -34,7 +48,7 @@
-
+
{!! Form::label('quantity_available', trans("ManageEvent.quantity_available"), array('class'=>' control-label')) !!} {!! Form::text('quantity_available', Input::old('quantity_available'), diff --git a/resources/views/ManageEvent/Modals/EditTicket.blade.php b/resources/views/ManageEvent/Modals/EditTicket.blade.php index a0ef94ce..e575f8df 100644 --- a/resources/views/ManageEvent/Modals/EditTicket.blade.php +++ b/resources/views/ManageEvent/Modals/EditTicket.blade.php @@ -14,7 +14,21 @@ {!! Form::text('title', null,['class'=>'form-control', 'placeholder'=>'E.g: General Admission']) !!}
-
+
+
+ {!! Form::label('ticket_date', trans("ManageEvent.ticket_date"), array('class'=>' control-label required')) !!} + + {!! Form::text('ticket_date', $ticket->getFormattedDate('ticket_date'), + [ + 'class' => 'form-control tdate hasDatepicker', + 'data-field' => 'datetime', + 'data-startend' => 'tdate', + 'data-startendelem' => '.end', + 'readonly' => '' + ]) !!} +
+
+
{!! Form::label('price', trans("ManageEvent.ticket_price"), array('class'=>'control-label required')) !!} {!! Form::text('price', null, @@ -24,7 +38,7 @@ )) !!}
-
+
{!! Form::label('quantity_available', trans("ManageEvent.quantity_available"), array('class'=>' control-label')) !!} {!! Form::text('quantity_available', null, @@ -46,6 +60,7 @@
+
{!! Form::label('start_sale_date', trans("ManageEvent.start_sale_on"), array('class'=>' control-label')) !!} @@ -55,7 +70,7 @@ 'class' => 'form-control start hasDatepicker', 'data-field' => 'datetime', 'data-startend' => 'start', - 'data-startendelem' => '.end', + 'data-startendelem' => '.tdate', 'readonly' => '' ]) !!}
@@ -71,8 +86,8 @@ [ 'class' => 'form-control end hasDatepicker', 'data-field' => 'datetime', - 'data-startend' => 'end', - 'data-startendelem' => '.start', + 'data-startend' => 'start', + 'data-startendelem' => '.tdate', 'readonly' => '' ]) !!}
diff --git a/resources/views/Shared/Layouts/Master.blade.php b/resources/views/Shared/Layouts/Master.blade.php index 1e8e850a..9783afaf 100644 --- a/resources/views/Shared/Layouts/Master.blade.php +++ b/resources/views/Shared/Layouts/Master.blade.php @@ -1,18 +1,9 @@ - @section('title') - Attendize - + BiletTM - @show