From c5473c40ff4262fa1ef73c4e1bed051cd54b3316 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 11:19:32 +0500 Subject: [PATCH 01/27] close admin registration --- config/backpack/base.php | 10 +++++----- .../ViewEvent/Partials/EventTicketsSection.blade.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/backpack/base.php b/config/backpack/base.php index 230f34e1..dcabb582 100644 --- a/config/backpack/base.php +++ b/config/backpack/base.php @@ -19,13 +19,13 @@ return [ 'logo_mini' => 'Btm', // Developer or company name. Shown in footer. - 'developer_name' => 'Merdan Muhammedow', + 'developer_name' => 'Digital TPS', // Developer website. Link in footer. - 'developer_link' => 'http://tmchat.ru', + 'developer_link' => 'http://tpsadvertising.com', // Show powered by Laravel Backpack in the footer? - 'show_powered_by' => true, + 'show_powered_by' => false, // The AdminLTE skin. Affects menu color and primary/secondary colors used throughout the application. 'skin' => 'skin-purple', @@ -57,7 +57,7 @@ return [ | By default the registration is open only on localhost. */ - 'registration_open' => env('BACKPACK_REGISTRATION_OPEN', true), + 'registration_open' => env('BACKPACK_REGISTRATION_OPEN', false), /* |-------------------------------------------------------------------------- @@ -121,7 +121,7 @@ return [ // Other options: // - placehold (generic image with his first letter) // - example_method_name (specify the method on the User model that returns the URL) - 'avatar_type' => 'gravatar', + 'avatar_type' => 'placehold', /* |-------------------------------------------------------------------------- diff --git a/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php index 86eb4269..960f43a2 100644 --- a/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php @@ -44,7 +44,7 @@ {{money($ticket->total_price, $event->currency)}} {{ ($event->organiser->tax_name && $event->organiser->tax_value) ? '(+'.money(($ticket->total_price*($event->organiser->tax_value)/100), $event->currency).' '.$event->organiser->tax_name.')' : '' }} + content="{{ $event->currency->code ?? 'manat'}}"> @endif From d116c1b9616e4bf2979c69c005e2537ee91b24f1 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:33:48 +0500 Subject: [PATCH 02/27] event place map --- .../Bilettm/ViewEvent/EventPage.blade.php | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 9196f546..0deb48cc 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -56,13 +56,25 @@
-
- +
+
-@endsection \ No newline at end of file +@endsection + +@section('after_scripts') + + +@endsection From 89e2614e5b1bcf4d73ad8d1b5c0b087e29a29cc4 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:38:13 +0500 Subject: [PATCH 03/27] view bug --- resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php index 80ca0b7c..eab96af3 100644 --- a/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php +++ b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php @@ -41,7 +41,7 @@ @endforeach - {!!Form::submit('{{__("ClientSide.buy_ticket")', ['class' => 'btn btn-lg btn-danger'])!!} + {!!Form::submit(trans('ClientSide.buy_ticket'), ['class' => 'btn btn-lg btn-danger'])!!} {!! Form::close() !!} @@ -77,4 +77,4 @@ }); -@endpush \ No newline at end of file +@endpush From 191a30c02379cd876f14161ccc9efbece6f9a5ff Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:43:02 +0500 Subject: [PATCH 04/27] view map bug --- resources/views/Bilettm/ViewEvent/EventPage.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 0deb48cc..e50c03b7 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@ From a99cf4277bed8d35aac534cd385c7cb76afeb9cc Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:53:35 +0500 Subject: [PATCH 06/27] view map bug --- resources/views/Bilettm/ViewEvent/EventPage.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 62453826..d5cda2e2 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -71,7 +71,7 @@ function initMap() { map = new google.maps.Map(document.getElementById('map'), { center: {lat: {{$event->venue->address['latlng']['lat']}}, lng: {{$event->venue->address['latlng']['lng']}}}, - zoom: 12 + zoom: 8 }); } From 16f515f375937f1d3ee7c0970cec308ee513ab49 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:55:53 +0500 Subject: [PATCH 07/27] view map bug --- resources/views/Bilettm/ViewEvent/EventPage.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index d5cda2e2..9e1a0caf 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -71,7 +71,7 @@ function initMap() { map = new google.maps.Map(document.getElementById('map'), { center: {lat: {{$event->venue->address['latlng']['lat']}}, lng: {{$event->venue->address['latlng']['lng']}}}, - zoom: 8 + zoom: 10 }); } From 1f7770a8d740fffc9bba1a4ae919fbaf325a064b Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 12:56:38 +0500 Subject: [PATCH 08/27] view map bug --- resources/views/Bilettm/ViewEvent/EventPage.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 9e1a0caf..117e1135 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -71,7 +71,7 @@ function initMap() { map = new google.maps.Map(document.getElementById('map'), { center: {lat: {{$event->venue->address['latlng']['lat']}}, lng: {{$event->venue->address['latlng']['lng']}}}, - zoom: 10 + zoom: 15 }); } From 3528c2d01231615783c97a01f14d98ccf30cab05 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 30 Nov 2019 13:01:26 +0500 Subject: [PATCH 09/27] view map add marker --- resources/views/Bilettm/ViewEvent/EventPage.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 117e1135..62594883 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -67,12 +67,13 @@ @section('after_scripts') @include("Shared.Partials.LangScript") {!!HTML::script(config('attendize.cdn_url_static_assets').'/assets/javascript/frontend.js')!!} -@endsection \ No newline at end of file +@endsection From 304179fc695cdea27d1971486f5e894ecb499f17 Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 6 Dec 2019 17:18:39 +0500 Subject: [PATCH 14/27] remove reklama --- .../Bilettm/Partials/PublicHeader.blade.php | 14 ++++---- .../views/Bilettm/Public/HomePage.blade.php | 36 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/views/Bilettm/Partials/PublicHeader.blade.php b/resources/views/Bilettm/Partials/PublicHeader.blade.php index 7cb844ea..2c997a85 100644 --- a/resources/views/Bilettm/Partials/PublicHeader.blade.php +++ b/resources/views/Bilettm/Partials/PublicHeader.blade.php @@ -1,12 +1,12 @@
-
-
-
- -
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}}
diff --git a/resources/views/Bilettm/Public/HomePage.blade.php b/resources/views/Bilettm/Public/HomePage.blade.php index da8f2c97..bba2584b 100644 --- a/resources/views/Bilettm/Public/HomePage.blade.php +++ b/resources/views/Bilettm/Public/HomePage.blade.php @@ -13,28 +13,28 @@ @include('Bilettm.Partials.HomeMusical') -
-
-
- - - -
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} @if(isset($theatre)) @include('Bilettm.Partials.HomeTheatre') @endif -
-
-
- - - -
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} @endsection @section('after_scripts') From 10a1c8bffd785cab8f5affcc196ba3ed08a6ad58 Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 6 Dec 2019 17:34:07 +0500 Subject: [PATCH 15/27] slider top --- resources/views/Bilettm/Partials/HomeSlider.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/Bilettm/Partials/HomeSlider.blade.php b/resources/views/Bilettm/Partials/HomeSlider.blade.php index 36479b48..f2ba90d9 100644 --- a/resources/views/Bilettm/Partials/HomeSlider.blade.php +++ b/resources/views/Bilettm/Partials/HomeSlider.blade.php @@ -1,7 +1,7 @@ \ No newline at end of file + From 2b84a2b86b24e765a015c3af0369daa5e6ab9e5f Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 6 Dec 2019 17:43:13 +0500 Subject: [PATCH 16/27] slider top --- resources/views/Bilettm/Partials/HomeSlider.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Bilettm/Partials/HomeSlider.blade.php b/resources/views/Bilettm/Partials/HomeSlider.blade.php index f2ba90d9..3b37fccd 100644 --- a/resources/views/Bilettm/Partials/HomeSlider.blade.php +++ b/resources/views/Bilettm/Partials/HomeSlider.blade.php @@ -17,7 +17,7 @@ data-description="">
+ style="position:absolute; top: 0; background-position: center center; background-size: cover; background-image: url({{asset($slider->image)}}); transform: unset !important;">
From 6e5d7ba99be106cf933eb021aa646dd1e7288c47 Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 6 Dec 2019 17:48:59 +0500 Subject: [PATCH 17/27] slider top fix --- resources/views/Bilettm/Partials/HomeSlider.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Bilettm/Partials/HomeSlider.blade.php b/resources/views/Bilettm/Partials/HomeSlider.blade.php index 3b37fccd..dd1b625f 100644 --- a/resources/views/Bilettm/Partials/HomeSlider.blade.php +++ b/resources/views/Bilettm/Partials/HomeSlider.blade.php @@ -17,7 +17,7 @@ data-description="">
+ style="position:absolute; top: 0; background-position: center center; background-size: cover; bottom: -100px; background-image: url({{asset($slider->image)}}); transform: unset !important;">
From cecf9899e6f68a5ba9bacd66aad868e0cbc0314e Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 9 Dec 2019 16:31:30 +0500 Subject: [PATCH 18/27] 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 @@ -

Расписание

-
-@if($event->end_date->isPast()) +@if(count($ticket_dates) > 0) +

Расписание

+
+ @if($event->end_date->isPast())

@lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')])

-@else - @if(count($ticket_dates) > 0) - + @else

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

    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 @@
    - +
    - +
    @lang("ManageEvent.print_attendee_list")
    @@ -88,6 +88,12 @@ {!!Html::sortable_link(trans("ManageEvent.ticket"), $sort_by, 'ticket_id', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!} + + {!!Html::sortable_link(trans("ManageEvent.ticket_date"), $sort_by, 'ticket_date', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!} + + + {!!Html::sortable_link(trans("ManageEvent.seat"), $sort_by, 'seat_no', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!} + {!!Html::sortable_link(trans("Order.order_ref"), $sort_by, 'order_reference', $sort_order, ['q' => $q , 'page' => $attendees->currentPage()])!!} @@ -106,6 +112,10 @@ {{{$attendee->ticket->title}}} + + {{$attendee->ticket->ticket_date}} + + {{$attendee->seat_no}} {{$attendee->order->order_reference}} From 65764b3570bb815859ae7620d0813b8ac688a34c Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 9 Dec 2019 17:22:50 +0500 Subject: [PATCH 19/27] attendees --- resources/views/ManageEvent/Attendees.blade.php | 2 +- resources/views/ManageEvent/CheckIn.blade.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/ManageEvent/Attendees.blade.php b/resources/views/ManageEvent/Attendees.blade.php index c6b29694..cfb737b2 100644 --- a/resources/views/ManageEvent/Attendees.blade.php +++ b/resources/views/ManageEvent/Attendees.blade.php @@ -118,7 +118,7 @@ {{$attendee->seat_no}} - {{$attendee->order->order_reference}} + {{$attendee->reference}} diff --git a/resources/views/ManageEvent/CheckIn.blade.php b/resources/views/ManageEvent/CheckIn.blade.php index e7b5b1b7..7953a3a0 100644 --- a/resources/views/ManageEvent/CheckIn.blade.php +++ b/resources/views/ManageEvent/CheckIn.blade.php @@ -89,11 +89,12 @@ class="at list-group-item" :class = "{arrived : attendee.has_arrived || attendee.has_arrived == '1'}" > - @lang("Attendee.name"): @{{ attendee.first_name }} @{{ attendee.last_name }}   @lang("Order.awaiting_payment") + @lang("Attendee.name"): @{{ attendee.first_name }} @{{ attendee.last_name }} +   @lang("Order.awaiting_payment")
    @lang("Order.reference"): @{{ attendee.order_reference + '-' + attendee.reference_index }}
    - @lang("Order.ticket"): @{{ attendee.ticket }} + @lang("Order.ticket"): @{{ attendee.ticket.ticket_date }} @{{attendee.seat_no}} From 17e36090e2c51f8a560426088db6f22428c9abab Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 9 Dec 2019 17:28:39 +0500 Subject: [PATCH 20/27] attendees check in --- app/Http/Controllers/EventCheckInController.php | 2 ++ resources/views/ManageEvent/CheckIn.blade.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 35535256..9d79e9a4 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -149,7 +149,9 @@ class EventCheckInController extends MyBaseController 'attendees.reference_index', 'attendees.arrival_time', 'attendees.has_arrived', + 'attendees.seat_no', 'tickets.title as ticket', + 'tickets.ticket_date as date' ])->first(); if (is_null($attendee)) { diff --git a/resources/views/ManageEvent/CheckIn.blade.php b/resources/views/ManageEvent/CheckIn.blade.php index 7953a3a0..3bf15907 100644 --- a/resources/views/ManageEvent/CheckIn.blade.php +++ b/resources/views/ManageEvent/CheckIn.blade.php @@ -94,7 +94,7 @@
    @lang("Order.reference"): @{{ attendee.order_reference + '-' + attendee.reference_index }}
    - @lang("Order.ticket"): @{{ attendee.ticket.ticket_date }} @{{attendee.seat_no}} + @lang("Order.ticket"): @{{ attendee.date }} @{{attendee.seat_no}} From 4d61232d50096d688c68556321693224c65ca818 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 9 Dec 2019 17:31:31 +0500 Subject: [PATCH 21/27] attendees check in --- app/Http/Controllers/EventCheckInController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 9d79e9a4..0a2773c1 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -75,7 +75,9 @@ class EventCheckInController extends MyBaseController 'attendees.arrival_time', 'attendees.reference_index', 'attendees.has_arrived', + 'attendees.seat_no', 'tickets.title as ticket', + 'tickets.ticket_date as date', 'orders.order_reference', 'orders.is_payment_received' ]) From a961cebf73a15d4d24609f5891da993f578818e9 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 11 Dec 2019 18:06:04 +0500 Subject: [PATCH 22/27] attendees check in --- app/Http/Controllers/EventViewController.php | 2 +- public/assets/stylesheet/custom.css | 34 +++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index a16c6df8..6c83b344 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -33,7 +33,7 @@ class EventViewController extends Controller return view('Public.ViewEvent.EventNotLivePage'); } - $now =Carbon::now(config('app.timezone')); + $now = Carbon::now(config('app.timezone')); $tickets = $event->tickets()->select('id','ticket_date') ->where('is_hidden', false) ->where('ticket_date','>=',$now) diff --git a/public/assets/stylesheet/custom.css b/public/assets/stylesheet/custom.css index 1c7aa221..373777de 100644 --- a/public/assets/stylesheet/custom.css +++ b/public/assets/stylesheet/custom.css @@ -1975,4 +1975,36 @@ choose_seats_content > div.tab-pane.fade{ #confirm-seats{ background-color: #d43d34; color: #ffffff; -} \ No newline at end of file +} +#kinoteator { + margin-top: 50px; +} + +#kinoteator-tab1 .owl-dots, .movie-items-group .owl-dots { + margin-top: 30px; +} + +#kinoteator .tab-ozi { + margin-top: 30px; +} + +#kinoteator-tab1 .owl-nav{ + top: -85px; +} + +#konserty .tab-ozi { + margin-top: 40px; +} + +#konserty-tab1 .owl-nav { + top: -97px; +} + +#konserty-tab1 .owl-dots { + margin-top: 30px; +} + +#teator{ + padding-top: 100px !important; + padding-bottom: 150px !important; +} From 4a97b3bc47da8c63d22ee31492c4e35f9ff15e0d Mon Sep 17 00:00:00 2001 From: merdiano Date: Fri, 13 Dec 2019 13:51:05 +0500 Subject: [PATCH 23/27] seat selection completed reservation and booking --- public/assets/stylesheet/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/stylesheet/custom.css b/public/assets/stylesheet/custom.css index 1c7aa221..d41417f8 100644 --- a/public/assets/stylesheet/custom.css +++ b/public/assets/stylesheet/custom.css @@ -153,7 +153,7 @@ article > .u-block-hover__additional--partially-slide-up { background-color: #ffffff; } #kinoteator { - margin-top: 20px; } + margin-top: 50px; } #kinoteator .tab-header h2 { font-size: 35px; font-weight: bold; } From c876cda641938a61a97745843742e98b6a90b571 Mon Sep 17 00:00:00 2001 From: merdiano Date: Fri, 13 Dec 2019 17:49:23 +0500 Subject: [PATCH 24/27] fix home view --- public/assets/stylesheet/custom.css | 57 +++++++++++++++---- .../Bilettm/Partials/CinemaItem.blade.php | 11 ++-- .../Bilettm/Partials/HomeTheatre.blade.php | 10 +++- .../Bilettm/Partials/MusicalItem.blade.php | 11 ++-- 4 files changed, 67 insertions(+), 22 deletions(-) diff --git a/public/assets/stylesheet/custom.css b/public/assets/stylesheet/custom.css index 70b5c774..8b29a6f1 100644 --- a/public/assets/stylesheet/custom.css +++ b/public/assets/stylesheet/custom.css @@ -220,8 +220,6 @@ article.u-block-hover img { width: 100%; margin-bottom: 1px; } -#teator { - margin-top: 50px; } #teator .tab-header h2 { font-size: 35px; font-weight: bold; @@ -334,6 +332,32 @@ article.u-block-hover img { transition-duration: .3s; width: 56px; border: none !important; } +#teator .owl-next{ + background-color: #FFFFFF; + background-image: url(../images/icons/right.png); + background-size: 56px !important; + transition-property: opacity; + transition-duration: .3s; + width: 56px; + height: 56px; + border: none !important; } +#teator .owl-next span, #teator .owl-prev span{ + opacity: 0; +} +#teator .owl-nav{ + position: absolute; + right: 290px; + top: 3px; +} +#teator .owl-prev{ + background-color: #ffffff; + background-image: url(../images/icons/left.png); + background-size: 56px !important; + transition-property: opacity; + transition-duration: .3s; + width: 56px; + height: 56px; + border: none !important; } #kinoteator-tab1 .owl-prev, .movie-items-group .owl-prev { background-image: url(../images/icons/left.png); background-size: 56px !important; @@ -709,7 +733,7 @@ img.d2-img { padding: 0 !important; } #teator .tab-ozi { - padding: 0 30px 0 20px; } + padding: 0 10px 0 20px; } #teator .tab-ozi .nav.u-nav-v1-1 { padding-left: 0; } @@ -1898,14 +1922,26 @@ input.reserved-seats ~ label svg { line-height: 30px; } -.overlay-details-bottom-part a.share svg, .overlay-details-bottom-part a.like svg{ +.overlay-details-bottom-part a.share svg{ width: 20px; } -.big-cinema-item-col6 .overlay-details-bottom-part a.share svg, .big-cinema-item-col6 .overlay-details-bottom-part a.like svg{ +.big-cinema-item-col6 .overlay-details-bottom-part a.share svg{ width: 40px; } +.overlay-details-bottom-part a.share svg, .overlay-details-bottom-part a.like i{ + font-size: 30px; + top: 4px; + position: relative; +} + +.big-cinema-item-col6 .overlay-details-bottom-part a.share svg, .big-cinema-item-col6 .overlay-details-bottom-part a.like i{ + font-size: 50px; + top: 9px; + position: relative; +} + .big-cinema-item-col6 .overlay-details .overlay-details-bottom-part span.cost{ font-size: 30px; } @@ -1977,7 +2013,7 @@ choose_seats_content > div.tab-pane.fade{ color: #ffffff; } #kinoteator { - margin-top: 50px; + margin-top: 100px; } #kinoteator-tab1 .owl-dots, .movie-items-group .owl-dots { @@ -1985,11 +2021,11 @@ choose_seats_content > div.tab-pane.fade{ } #kinoteator .tab-ozi { - margin-top: 30px; + margin-top: 40px; } #kinoteator-tab1 .owl-nav{ - top: -85px; + top: -96px; } #konserty .tab-ozi { @@ -2004,7 +2040,6 @@ choose_seats_content > div.tab-pane.fade{ margin-top: 30px; } -#teator{ - padding-top: 100px !important; - padding-bottom: 150px !important; +#teator.container{ + padding: 100px 7.2% !important; } diff --git a/resources/views/Bilettm/Partials/CinemaItem.blade.php b/resources/views/Bilettm/Partials/CinemaItem.blade.php index d632c5ad..607c666a 100644 --- a/resources/views/Bilettm/Partials/CinemaItem.blade.php +++ b/resources/views/Bilettm/Partials/CinemaItem.blade.php @@ -11,16 +11,17 @@ @endif
    {{__("ClientSide.buy_ticket")}} diff --git a/resources/views/Bilettm/Partials/HomeTheatre.blade.php b/resources/views/Bilettm/Partials/HomeTheatre.blade.php index 5c377af0..3e80139b 100644 --- a/resources/views/Bilettm/Partials/HomeTheatre.blade.php +++ b/resources/views/Bilettm/Partials/HomeTheatre.blade.php @@ -1,8 +1,16 @@ @if(!empty($theatre->events) && $theatre->events->count()>0) -
    +

    {{$theatre->title}}

    +
    + + +
    {{__('ClientSide.view')}}
    diff --git a/resources/views/Bilettm/Partials/MusicalItem.blade.php b/resources/views/Bilettm/Partials/MusicalItem.blade.php index ebfaf688..42958f81 100644 --- a/resources/views/Bilettm/Partials/MusicalItem.blade.php +++ b/resources/views/Bilettm/Partials/MusicalItem.blade.php @@ -8,16 +8,17 @@

    {{$event->start_date->format('d M H:s')}}

    {{__("ClientSide.buy_ticket")}} From 2c61af9fa474bec90ff3472623295e75857e6c03 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 16 Dec 2019 18:26:11 +0500 Subject: [PATCH 25/27] view fixes --- .../Admin/CategoryCrudController.php | 2 + .../Admin/SectionCrudController.php | 12 +++- .../Admin/SliderCrudController.php | 8 ++- .../Controllers/Admin/VenueCrudController.php | 8 ++- ...13_164045_localizaton_migration_fileds.php | 58 +++++++++++++++++++ .../Partials/HeaderSection.blade.php | 21 +------ .../Bilettm/ViewEvent/SeatsPage.blade.php | 5 +- resources/views/errors/500.blade.php | 5 +- resources/views/errors/503.blade.php | 5 +- 9 files changed, 94 insertions(+), 30 deletions(-) create mode 100644 database/migrations/2019_12_13_164045_localizaton_migration_fileds.php diff --git a/app/Http/Controllers/Admin/CategoryCrudController.php b/app/Http/Controllers/Admin/CategoryCrudController.php index 6bbd0e9a..60495189 100644 --- a/app/Http/Controllers/Admin/CategoryCrudController.php +++ b/app/Http/Controllers/Admin/CategoryCrudController.php @@ -36,6 +36,7 @@ class CategoryCrudController extends CrudController // $this->crud->setFromDb(); $this->crud->addColumns([ ['name'=>'id','type'=>'text','label'=>'Id'], + ['name'=>'title','type'=>'text','label'=>'Title en'], ['name'=>'title_tk','type'=>'text','label'=>'Title tm'], ['name'=>'title_ru','type'=>'text','label'=>'Title ru'], ['name'=>'view_type','type'=>'text','label'=>'View Type'], @@ -43,6 +44,7 @@ class CategoryCrudController extends CrudController ['name'=>'parent_id','type'=>'text','label'=>'Parent'], ]); $this->crud->addFields([ + ['name'=>'title','type'=>'text','label'=>'Title em'], ['name'=>'title_tk','type'=>'text','label'=>'Title tm'], ['name'=>'title_ru','type'=>'text','label'=>'Title ru'], ['name'=>'view_type','type' =>'enum', 'label'=>'View Type'], diff --git a/app/Http/Controllers/Admin/SectionCrudController.php b/app/Http/Controllers/Admin/SectionCrudController.php index ba8f2279..50a11022 100644 --- a/app/Http/Controllers/Admin/SectionCrudController.php +++ b/app/Http/Controllers/Admin/SectionCrudController.php @@ -36,13 +36,21 @@ class SectionCrudController extends CrudController // TODO: remove setFromDb() and manually define Fields and Columns // $this->crud->setFromDb(); $this->crud->addColumns([ - ['name'=>'section_no','type'=>'text','label'=>'Section No'], - ['name'=>'description','type'=>'text','label'=>'Description'], + ['name'=>'section_no','type'=>'text','label'=>'Section No En'], + ['name'=>'section_no_ru','type'=>'text','label'=>'Section No Ru'], + ['name'=>'section_no_tk','type'=>'text','label'=>'Section No Tk'], + ['name'=>'description','type'=>'text','label'=>'Description En'], + ['name'=>'description_ru','type'=>'text','label'=>'Description Ru'], + ['name'=>'description_tk','type'=>'text','label'=>'Description Tk'], ]); $this->crud->addFields([ ['name'=>'section_no','type'=>'text','label'=>'Section No'], + ['name'=>'section_no_ru','type'=>'text','label'=>'Section No Ru'], + ['name'=>'section_no_tk','type'=>'text','label'=>'Section No Tk'], ['name'=>'description','type'=>'text','label'=>'Description'], + ['name'=>'description_ru','type'=>'text','label'=>'Description Ru'], + ['name'=>'description_tk','type'=>'text','label'=>'Description Tk'], ['name' => 'venue_id', 'type'=>'select','entity'=>'venue','attribute'=>'venue_name'], [ // image 'label' => "Section Image", diff --git a/app/Http/Controllers/Admin/SliderCrudController.php b/app/Http/Controllers/Admin/SliderCrudController.php index 27962fa4..4b5a195b 100644 --- a/app/Http/Controllers/Admin/SliderCrudController.php +++ b/app/Http/Controllers/Admin/SliderCrudController.php @@ -34,8 +34,12 @@ class SliderCrudController extends CrudController // TODO: remove setFromDb() and manually define Fields and Columns $this->crud->addColumns([ - ['name' => 'title','type' => 'text', 'label' => 'Title'], - ['name' => 'text','type' => 'text', 'label' => 'Text'], + ['name' => 'title','type' => 'text', 'label' => 'Title En'], + ['name' => 'title_ru','type' => 'text', 'label' => 'Title Ru'], + ['name' => 'title_tk','type' => 'text', 'label' => 'Title Tk'], + ['name' => 'text','type' => 'text', 'label' => 'Text En'], + ['name' => 'text_ru','type' => 'text', 'label' => 'Text Ru'], + ['name' => 'text_tk','type' => 'text', 'label' => 'Text Tk'], ['name' => 'link','type' => 'text', 'label' => 'Link'], ['name' => 'active','type' => 'boolean', 'label' => 'Active'], ['name' => 'image','type' => 'text', 'label' => 'Image'], diff --git a/app/Http/Controllers/Admin/VenueCrudController.php b/app/Http/Controllers/Admin/VenueCrudController.php index 4c312381..f68c4699 100644 --- a/app/Http/Controllers/Admin/VenueCrudController.php +++ b/app/Http/Controllers/Admin/VenueCrudController.php @@ -35,12 +35,16 @@ class VenueCrudController extends CrudController // TODO: remove setFromDb() and manually define Fields and Columns $this->crud->addColumns([ - ['name'=>'venue_name','type'=>'text','label'=>'Venue Name'], + ['name'=>'venue_name','type'=>'text','label'=>'Venue Name En'], + ['name'=>'venue_name_ru','type'=>'text','label'=>'Venue Name Ru'], + ['name'=>'venue_name_tk','type'=>'text','label'=>'Venue Name Tk'], ['name'=>'active','type'=>'boolean','label'=>'Active'] ]); $this->crud->addFields([ - ['name'=>'venue_name','type'=>'text','label'=>'Venue Name'], + ['name'=>'venue_name','type'=>'text','label'=>'Venue Name En'], + ['name'=>'venue_name_ru','type'=>'text','label'=>'Venue Name Ru'], + ['name'=>'venue_name_tk','type'=>'text','label'=>'Venue Name Tk'], [ // Address 'name' => 'address', 'label' => 'Address', diff --git a/database/migrations/2019_12_13_164045_localizaton_migration_fileds.php b/database/migrations/2019_12_13_164045_localizaton_migration_fileds.php new file mode 100644 index 00000000..42cf877c --- /dev/null +++ b/database/migrations/2019_12_13_164045_localizaton_migration_fileds.php @@ -0,0 +1,58 @@ +string('title_ru')->nullable(); + $table->string('title_tk')->nullable(); + $table->text('description_tk')->nullable(); + $table->text('description_ru')->nullable; + }); + + Schema::table('venues', function (Blueprint $table) { + $table->string('venue_name_ru')->nullable(); + $table->string('venue_name_tk')->nullable(); + }); + + Schema::table('sections', function (Blueprint $table) { + $table->string('section_no_ru')->nullable(); + $table->string('description_ru')->nullable(); + $table->string('section_no_tk')->nullable(); + $table->string('description_tk')->nullable(); + }); + + Schema::table('sliders', function (Blueprint $table) { + $table->string('title_ru')->nullable(); + $table->string('text_ru')->nullable(); + $table->string('title_tk')->nullable(); + $table->string('text_tk')->nullable(); + }); + + Schema::table('categories', function (Blueprint $table) { + $table->string('title')->nullable(); + + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/Bilettm/ViewEvent/Partials/HeaderSection.blade.php b/resources/views/Bilettm/ViewEvent/Partials/HeaderSection.blade.php index 6e453968..922000dc 100644 --- a/resources/views/Bilettm/ViewEvent/Partials/HeaderSection.blade.php +++ b/resources/views/Bilettm/ViewEvent/Partials/HeaderSection.blade.php @@ -13,25 +13,6 @@

    {{$event->title}}

    -
    - - {{ $event->startDateFormatted() }} - - - - - @if($event->start_date->diffInDays($event->end_date) == 0) - {{ $event->end_date->format('H:i') }} - @else - {{ $event->endDateFormatted() }} - @endif - - @lang("Public_ViewEvent.at") - - {{$event->venue->venue_name}} - - -
    -
    -
    \ No newline at end of file +
    diff --git a/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php b/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php index e74db21b..5e3b4cab 100644 --- a/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php @@ -65,7 +65,8 @@ @else
    -
    {{$ticket->title }} {{$ticket->section->section_no}} {{$ticket->section->description}}
    +
    {{$ticket->section->section_no}}
    +

    {{$ticket->section->description}}

    @@ -172,4 +173,4 @@ @include("Shared.Partials.LangScript") {!!HTML::script(config('attendize.cdn_url_static_assets').'/assets/javascript/frontend.js')!!} -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index a1782ded..ab7c0e88 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -1,3 +1,6 @@ +@php + $error_number = 400; +@endphp @@ -25,4 +28,4 @@ @lang("error.back_soon_description") </div> </body> -</html> \ No newline at end of file +</html> diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index a1782ded..ab7c0e88 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -1,3 +1,6 @@ +@php + $error_number = 400; +@endphp <html> <head> <title> @@ -25,4 +28,4 @@ @lang("error.back_soon_description") </div> </body> -</html> \ No newline at end of file +</html> From d4a5beb4023f97d91a5a34c35f377b4a9f4a0a00 Mon Sep 17 00:00:00 2001 From: merdiano <merdan.m@gmail.com> Date: Wed, 18 Dec 2019 15:11:29 +0500 Subject: [PATCH 26/27] fix ticket view --- .../ViewEvent/Partials/PDFTicket.blade.php | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php index d13a2f10..b92f97b8 100644 --- a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php +++ b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php @@ -51,8 +51,37 @@ </style> </head> - <body style="background-color: #FFFFFF; font-family: Arial, Helvetica, sans-serif;"> + <body style="background-color: #FFFFFF; font-family: Arial, Helvetica, sans-serif; padding-top: 20px"> <div class="container"> + <div class="row"> + <table border="1" style="width: 700px; margin: auto"> + <tr> + <td rowspan="2" style="width: 25%; padding: 20px; vertical-align: top; position: relative"> + <div style="background-color: #9dc1d3; width: 100%; padding-top: 100%"></div> + <span style="position: absolute; display: block; bottom: 20px; width: calc(100% - 40px); background-color: #FF2C00; height: 30px"></span> + </td> + <td style="width: 45%; padding: 20px; vertical-align: top"> + <span class="text-muted">Номер билета</span> + <h2 style="margin-top: 5px; margin-bottom: 0">XNMIG2711-1</h2> + </td> + <td rowspan="2" style="width: 30%; padding: 20px; vertical-align: top"> + <p><b>Lorem ipsum dolor sit amet.</b> <span class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci facere hic id minus non omnis porro provident repellat sunt voluptatibus!</span></p> + </td> + </tr> + <tr> + <td style="padding: 20px; vertical-align: top"> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Мероприятие:</span> <b>Веном</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Организатор:</span> <b>"Berkarar" cinema</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Дата и время:</span> <b>25-12-2019, 20-16</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">ФИО:</span> <b>Кирпа Михаил</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Тип билета:</span> <b>Стандартный</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Место:</span> <b>8 ряд, 6 место</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Стоимость билета:</span> <b>60 манат</b></p> + + </td> + </tr> + </table> + </div> @foreach($attendees as $attendee) @if(!$attendee->is_cancelled) <div class="ticket"> From 37c06f848853d61b70d2e5d8f6f578b96723e44e Mon Sep 17 00:00:00 2001 From: merdan <merdan.m@gmail.com> Date: Wed, 18 Dec 2019 16:19:44 +0500 Subject: [PATCH 27/27] ticket review --- .../ViewEvent/Partials/PDFTicket.blade.php | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php index b92f97b8..f642ec45 100644 --- a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php +++ b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php @@ -53,16 +53,25 @@ </head> <body style="background-color: #FFFFFF; font-family: Arial, Helvetica, sans-serif; padding-top: 20px"> <div class="container"> + @foreach($attendees as $attendee) + @if(!$attendee->is_cancelled) <div class="row"> <table border="1" style="width: 700px; margin: auto"> <tr> <td rowspan="2" style="width: 25%; padding: 20px; vertical-align: top; position: relative"> - <div style="background-color: #9dc1d3; width: 100%; padding-top: 100%"></div> + <div class="barcode"> + {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!} + </div> + @if($event->is_1d_barcode_enabled) + <div class="barcode_vertical"> + {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!} + </div> + @endif <span style="position: absolute; display: block; bottom: 20px; width: calc(100% - 40px); background-color: #FF2C00; height: 30px"></span> </td> <td style="width: 45%; padding: 20px; vertical-align: top"> <span class="text-muted">Номер билета</span> - <h2 style="margin-top: 5px; margin-bottom: 0">XNMIG2711-1</h2> + <h2 style="margin-top: 5px; margin-bottom: 0">{{$attendee->reference}}</h2> </td> <td rowspan="2" style="width: 30%; padding: 20px; vertical-align: top"> <p><b>Lorem ipsum dolor sit amet.</b> <span class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci facere hic id minus non omnis porro provident repellat sunt voluptatibus!</span></p> @@ -70,20 +79,26 @@ </tr> <tr> <td style="padding: 20px; vertical-align: top"> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Мероприятие:</span> <b>Веном</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Организатор:</span> <b>"Berkarar" cinema</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Дата и время:</span> <b>25-12-2019, 20-16</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">ФИО:</span> <b>Кирпа Михаил</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Тип билета:</span> <b>Стандартный</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Место:</span> <b>8 ряд, 6 место</b></p> - <p style="margin-bottom: 5px !important;"><span class="text-muted">Стоимость билета:</span> <b>60 манат</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Мероприятие:</span> <b>{{$event->title}}</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Организатор:</span> <b>{{$event->venue->venue_name}}</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Дата и время:</span> <b>{{$attendee->ticket->ticket_date->format('d.m.Y HH:ss')}}</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">ФИО:</span> <b>{{$attendee->first_name.' '.$attendee->last_name}}</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Тип билета:</span> <b>{{$attendee->ticket->title}}</b></p> + <p style="margin-bottom: 5px !important;"><span class="text-muted">Место:</span> <b>{{$attendee->seat_no}}</b></p> + @php + // Calculating grand total including tax + $grand_total = $attendee->ticket->total_price; + $tax_amt = ($grand_total * $event->organiser->tax_value) / 100; + $grand_total += $tax_amt; + @endphp + + <p style="margin-bottom: 5px !important;"><span class="text-muted">Стоимость билета:</span> <b>{{money($grand_total, $order->event->currency)}} @if ($attendee->ticket->total_booking_fee) (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency)}}</b></p> </td> </tr> </table> </div> - @foreach($attendees as $attendee) - @if(!$attendee->is_cancelled) + <div class="ticket"> <div class='logo'> @@ -122,21 +137,14 @@ // Calculating grand total including tax $grand_total = $attendee->ticket->total_price; $tax_amt = ($grand_total * $event->organiser->tax_value) / 100; - $grand_total = $tax_amt + $grand_total; + $grand_total += $tax_amt; @endphp {{money($grand_total, $order->event->currency)}} @if ($attendee->ticket->total_booking_fee) (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency)}} @lang("Public_ViewEvent.inc_fees")) @endif @if ($event->organiser->tax_name) (inc. {{money($tax_amt, $order->event->currency)}} {{$event->organiser->tax_name}}) <br><br>{{$event->organiser->tax_name}} ID: {{ $event->organiser->tax_id }} @endif </div> </div> - <div class="barcode"> - {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!} - </div> - @if($event->is_1d_barcode_enabled) - <div class="barcode_vertical"> - {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!} - </div> - @endif + </div> @endif @endforeach