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/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 35535256..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' ]) @@ -149,7 +151,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/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/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index d4341d24..5c4830bd 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -118,16 +118,16 @@ class PublicController extends Controller public function postAddEvent(AddEventRequest $request){ $addEvent = EventRequest::create([ - 'name' => $request->get('name'), - 'email' => $request->get('email'), - 'phone' => $request->get('phone'), - 'detail' => $request->get('detail') + 'name' => sanitise($request->get('name')), + 'email' => sanitise($request->get('email')), + 'phone' => sanitise($request->get('phone')), + 'detail' => sanitise($request->get('detail')) ]); return view('Bilettm.Public.AddEventResult',compact('addEvent')); } public function subscribe(SubscribeRequest $request){ - $email = $request->get('email'); + $email = sanitise($request->get('email')); //todo validate email $subscribe = Subscriber::updateOrCreate(['email'=>$email,'active'=>1]); @@ -140,11 +140,4 @@ class PublicController extends Controller 'message' => 'Subscription successfully', ]); } - - //locale - public function setLocale($locale){ - App::setLocale($locale); - - return redirect()->back(); - } } \ No newline at end of file diff --git a/app/Payment/CardPayment.php b/app/Payment/CardPayment.php index fac2cbc9..619f9cbe 100644 --- a/app/Payment/CardPayment.php +++ b/app/Payment/CardPayment.php @@ -37,6 +37,19 @@ class CardPayment{ return $response; } + public function registerCard($cardDetails){ + $response = new CardRegistrationResponce; + + try{ + $request = $this->client->post('processform.do',['form_params' =>$cardDetails]); + $response->setResponseData($request->getBody()); + }catch (\Exception $ex){ + Log::error($ex); + $error = 'Sorry, there was an error processing your payment. Please try again.'; + $response->setExceptionMessage($error); + } + } + public function getPaymentStatus($orderId){ $params['form_params'] = config('payment.card.params'); $params['form_params']['orderId'] = $orderId; @@ -51,4 +64,4 @@ class CardPayment{ } return $response; } -} \ No newline at end of file +} diff --git a/app/Payment/CardRegistrationResponce.php b/app/Payment/CardRegistrationResponce.php new file mode 100644 index 00000000..50b95489 --- /dev/null +++ b/app/Payment/CardRegistrationResponce.php @@ -0,0 +1,19 @@ + '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/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/public/assets/stylesheet/custom.css b/public/assets/stylesheet/custom.css index 1c7aa221..8b29a6f1 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; } @@ -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; } @@ -1975,4 +2011,35 @@ choose_seats_content > div.tab-pane.fade{ #confirm-seats{ background-color: #d43d34; color: #ffffff; -} \ No newline at end of file +} +#kinoteator { + margin-top: 100px; +} + +#kinoteator-tab1 .owl-dots, .movie-items-group .owl-dots { + margin-top: 30px; +} + +#kinoteator .tab-ozi { + margin-top: 40px; +} + +#kinoteator-tab1 .owl-nav{ + top: -96px; +} + +#konserty .tab-ozi { + margin-top: 40px; +} + +#konserty-tab1 .owl-nav { + top: -97px; +} + +#konserty-tab1 .owl-dots { + margin-top: 30px; +} + +#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 5e82a416..607c666a 100644 --- a/resources/views/Bilettm/Partials/CinemaItem.blade.php +++ b/resources/views/Bilettm/Partials/CinemaItem.blade.php @@ -11,23 +11,22 @@ @endif
- + {{__('ClientSide.share')}} - - - - + {{----}} + {{----}} + {{----}} + {{----}} + {{$event->views}} {{__("ClientSide.views")}}
{{__("ClientSide.buy_ticket")}}
- @if(!empty($event->starting_ticket)) - {{__("ClientSide.prices_from")}}: {{$event->starting_ticket->first()->price ?? 'n/a'}} TMT - @endif +
diff --git a/resources/views/Bilettm/Partials/EventItem.blade.php b/resources/views/Bilettm/Partials/EventItem.blade.php index c76becd5..101c9f2d 100644 --- a/resources/views/Bilettm/Partials/EventItem.blade.php +++ b/resources/views/Bilettm/Partials/EventItem.blade.php @@ -15,12 +15,7 @@
{!! Markdown::parse($event->description) !!}
- @if($event->starting_ticket_price) -
- {{__("ClientSide.prices_from")}}: {{$event->starting_ticket_price}} TMT - {{__("ClientSide.buy_ticket")}} -
- @endif + diff --git a/resources/views/Bilettm/Partials/HomeSlider.blade.php b/resources/views/Bilettm/Partials/HomeSlider.blade.php index 36479b48..dd1b625f 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 + 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 f563df12..42958f81 100644 --- a/resources/views/Bilettm/Partials/MusicalItem.blade.php +++ b/resources/views/Bilettm/Partials/MusicalItem.blade.php @@ -8,23 +8,22 @@

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

{{__("ClientSide.buy_ticket")}}
- @if(!empty($event->starting_ticket)) - {{__("ClientSide.prices_from")}}: {{$event->starting_ticket->first()->price ?? 'n/a'}} TMT - @endif +
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') diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 9196f546..62594883 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -56,13 +56,26 @@
-
- +
+
-@endsection \ No newline at end of file +@endsection + +@section('after_scripts') + + +@endsection 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/Partials/Schedule.blade.php b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php index d6e11903..fcfed562 100644 --- a/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php +++ b/resources/views/Bilettm/ViewEvent/Partials/Schedule.blade.php @@ -1,15 +1,14 @@ -

{{__("ClientSide.schedule")}}

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

{{__('ClientSide.datePlay')}}

+ @else +

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

-

{{__("ClientSide.timePlay")}}

+

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

@@ -41,7 +40,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 +76,4 @@ }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php b/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php index 526cc19d..79d94bae 100644 --- a/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/SeatsPage.blade.php @@ -16,7 +16,7 @@ @endforeach @@ -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/ManageEvent/Attendees.blade.php b/resources/views/ManageEvent/Attendees.blade.php index 915a096b..cfb737b2 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 @@ + + @@ -106,9 +112,13 @@ + +
{!!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()])!!} {{{$attendee->ticket->title}}} + {{$attendee->ticket->ticket_date}} + {{$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..3bf15907 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.date }} @{{attendee.seat_no}} 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 diff --git a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php index d13a2f10..f642ec45 100644 --- a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php +++ b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php @@ -51,10 +51,54 @@ - +
@foreach($attendees as $attendee) @if(!$attendee->is_cancelled) +
+ + + + + + + + + +
+
+ {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!} +
+ @if($event->is_1d_barcode_enabled) +
+ {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!} +
+ @endif + + 		+ Номер билета +

{{$attendee->reference}}

+ 		+

Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci facere hic id minus non omnis porro provident repellat sunt voluptatibus!

+
+

Мероприятие: {{$event->title}}

+

Организатор: {{$event->venue->venue_name}}

+

Дата и время: {{$attendee->ticket->ticket_date->format('d.m.Y HH:ss')}}

+

ФИО: {{$attendee->first_name.' '.$attendee->last_name}}

+

Тип билета: {{$attendee->ticket->title}}

+

Место: {{$attendee->seat_no}}

+ @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 + +

Стоимость билета: {{money($grand_total, $order->event->currency)}} @if ($attendee->ticket->total_booking_fee) (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency)}}

+ +
+
+
-
- {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!} -
- @if($event->is_1d_barcode_enabled) -
- {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!} -
- @endif +
@endif @endforeach 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>