ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added event ticket date to tickets

This commit is contained in:
merdiano 2019-08-24 15:30:23 +05:00
parent 4b52ff9bea
commit bc456b4181
8 changed files with 96 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/EventTicketsController.php
View File

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

7
app/Models/Ticket.php
View File

@ -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)
];
}

1
resources/lang/en/ManageEvent.php
View File

@ -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' =>

43
resources/views/Bilettm/Partials/TicketSchedule.blade.php Normal file
View File

@ -0,0 +1,43 @@
<div class="col-12 p-0">
<h2 class="main-title" style="padding-left: 5px">Расписание</h2>
@if($event->end_date->isPast())
<div class="alert alert-boring">
@lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')])
</div>
@else
@if($tickets->count() > 0)
<div class="main-title-bottom-line" style="margin-left: 5px"></div>
<h4 class="date-small-title">Дата проведения</h4>
<div class="date-box-wrap">
<a href="">10.07.2019</a>
<a href="" class="active-date">20.07.2019</a>
</div>
<h4 class="time-small-title">Время проведения</h4>
<div class="time-box-wrap">
<form action="">
<div class="form-group">
<input type="checkbox" id="time1">
<label for="time1"><span>09:30</span></label>
</div>
<div class="form-group">
<input type="checkbox" id="time2">
<label for="time2"><span>12:25</span></label>
</div>
<div class="form-group">
<input type="checkbox" id="time3">
<label for="time3"><span>15:55</span></label>
</div>
<div class="form-group d-block">
<input type="submit" value="Купить билет">
</div>
</form>
</div>
@else
<div class="alert alert-boring">
@lang("Public_ViewEvent.tickets_are_currently_unavailable")
</div>
@endif
@endif
</div>

35
resources/views/Bilettm/ViewEvent/EventPage.blade.php
View File

@ -18,38 +18,19 @@
{{--<img src="assets/assets/img/teator/tall6.png" style="width: 450px" class="details-image">--}}
@endif
{!! Markdown::parse($event->description) !!}
<b>{{$event->organiser->name}}</b> @lang("Public_ViewEvent.presents")
@lang("Public_ViewEvent.at")
<span property="location" typeof="Place">
<b property="name">{{$event->venue_name}}</b>
<meta property="address" content="{{ urldecode($event->venue_name) }}">
</span>
</div>
<div class="col-12 p-0">
<h2 class="main-title" style="padding-left: 5px">Расписание</h2>
<div class="main-title-bottom-line" style="margin-left: 5px"></div>
<h4 class="date-small-title">Дата проведения</h4>
<div class="date-box-wrap">
<a href="">10.07.2019</a>
<a href="" class="active-date">20.07.2019</a>
</div>
<h4 class="time-small-title">Время проведения</h4>
<div class="time-box-wrap">
<form action="">
<div class="form-group">
<input type="checkbox" id="time1">
<label for="time1"><span>09:30</span></label>
</div>
<div class="form-group">
<input type="checkbox" id="time2">
<label for="time2"><span>12:25</span></label>
</div>
<div class="form-group">
<input type="checkbox" id="time3">
<label for="time3"><span>15:55</span></label>
</div>
</form>
</div>
</div>
@include('Bilettm.Partials.TicketSchedule')
</div>
</div>
</div>
<div class="col-2 text-center">
<a id="submit-a">Купить билет</a>
@include('Bilettm.Partials.EventShareButtons')
<img src="assets/assets/img/konserty/adv.png" style="width: 100%">
</div>

18
resources/views/ManageEvent/Modals/CreateTicket.blade.php
View File

@ -21,7 +21,21 @@
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! 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' => ''
]) !!}
</div>
</div>
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! Form::label('price', trans("ManageEvent.ticket_price"), array('class'=>'control-label required')) !!}
{!! Form::text('price', Input::old('price'),
@ -34,7 +48,7 @@
</div>
</div>
<div class="col-sm-6">
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! Form::label('quantity_available', trans("ManageEvent.quantity_available"), array('class'=>' control-label')) !!}
{!! Form::text('quantity_available', Input::old('quantity_available'),

25
resources/views/ManageEvent/Modals/EditTicket.blade.php
View File

@ -14,7 +14,21 @@
{!! Form::text('title', null,['class'=>'form-control', 'placeholder'=>'E.g: General Admission']) !!}
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! 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' => ''
]) !!}
</div>
</div>
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! Form::label('price', trans("ManageEvent.ticket_price"), array('class'=>'control-label required')) !!}
{!! Form::text('price', null,
@ -24,7 +38,7 @@
)) !!}
</div>
</div>
<div class="col-sm-6">
<div class="col-sm-6 col-md-4">
<div class="form-group">
{!! Form::label('quantity_available', trans("ManageEvent.quantity_available"), array('class'=>' control-label')) !!}
{!! Form::text('quantity_available', null,
@ -46,6 +60,7 @@
</div>
<div class="row more-options">
<div class="col-sm-6">
<div class="form-group">
{!! 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' => ''
]) !!}
</div>
@ -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' => ''
]) !!}
</div>

11
resources/views/Shared/Layouts/Master.blade.php
View File

@ -1,18 +1,9 @@
<!DOCTYPE html>
<html lang="{{ Lang::locale() }}">
<head>
<!--
_ _ _ _
/\ | | | | | (_)
/ \ | |_| |_ ___ _ __ __| |_ _______ ___ ___ _ __ ___
/ /\ \| __| __/ _ \ '_ \ / _` | |_ / _ \ / __/ _ \| '_ ` _ \
/ ____ \ |_| || __/ | | | (_| | |/ / __/| (_| (_) | | | | | |
/_/ \_\__|\__\___|_| |_|\__,_|_/___\___(_)___\___/|_| |_| |_|
-->
<title>
@section('title')
Attendize -
BiletTM -
@show
</title>