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

view bug fix

This commit is contained in:
merdan 2020-03-05 18:35:58 +05:00
parent 263e55eccb
commit ee51de5838
10 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/helpers.php
View File

@ -30,7 +30,7 @@ if(!function_exists('main_categories')){
if(!function_exists('venues_list')){
function venues_list(){
return \App\Models\Venue::where('active',1)->pluck('venue_name','id');
return \App\Models\Venue::where('active',1)->pluck('venue_name_ru','id');
}
}
if(!function_exists('sections_list')){

2
app/Http/Controllers/EventCheckoutController.php
View File

@ -141,7 +141,7 @@ class EventCheckoutController extends Controller
if(count($reserved_tickets)>0 || count($booked_tickets)>0)
return response()->json([
'status' => 'error',
'messages' => 'Some of selected seats are already reserved',//todo show which are reserved
'message' => trans('ClientSide.message_reserved'),//todo show which are reserved
]);
$ticket = Ticket::findOrFail($ticket_id);

3
resources/lang/en/ClientSide.php
View File

@ -119,6 +119,8 @@ return [
'payment_cancelled' => 'Payment cancelled',
'no_ordere_id' => 'Order id does not exist',
'order_error' => 'Whoops! There was a problem processing your order. Please try again.',
'message_reserved' => 'Some of selected seats are already reserved',
'message_wait' => 'Just a second',
//About page
'about_us' => 'About us',
@ -129,6 +131,7 @@ return [
'cooperation' => 'Cooperation',
'oferta' => 'Oferta',
'terms_conditions' => 'Terms and conditions',
//add event request and subscribe

41
resources/lang/ru/ClientSide.php
View File

@ -63,7 +63,7 @@ return [
'rassylka' => 'РАССЫЛКА',
'collective' => 'КОЛЛЕКТИВНЫЕ ЗАКАЗЫ',
'organizers' => 'ОРГАНИЗАТОРАМ',
'concert_halls' => 'КОНЦЕРТНЫМ ПЛОЩАДКАМ',
'concert_halls' => 'ПЛОЩАДКИ',
'partners' => 'ПАРТНЁРАМ',
'logo' => 'ЛОГОТИП ДЛЯ АФИШ И СМИ',
'addEvent' => 'Добавить событие',
@ -114,20 +114,21 @@ return [
//Chcekout page
'checkout' => 'Checkout',
'no_seats' => 'No seats selected',
'min_ticket_message' => 'You must select at least :min tickets.',
'max_ticket_message' => 'The maximum number of tickets you can register is :max',
'holder_first_name_required' => 'Ticket holder :seat\'s first name is required',
'holder_last_name_required' => 'Ticket holder :seat\'s last name is required',
'holder_email_required' => 'Ticket holder :seat\'s email is required',
'holder_email_invalid' => 'Ticket holder :seat\'s email appears to be invalid',
'question_required' => "This question is required",
'enable_javascript' => 'Please enable Javascript in your browser.',
'payment_error' => 'Sorry, there was an error processing your payment. Please try again.',
'payment_cancelled' => 'Payment cancelled',
'no_ordere_id' => 'Order id does not exist',
'order_error' => 'Whoops! There was a problem processing your order. Please try again.',
'no_seats' => 'Вы не выбрали место',
'min_ticket_message' => 'Вам следует выбрать, как минимум, :min билет.',
'max_ticket_message' => 'Вы можете выбрать максимальное количество мест :max',
'holder_first_name_required' => 'Заполните имя владельца билета :seat',
'holder_last_name_required' => 'Заполните фамилию владельца билета :seat',
'holder_email_required' => 'Заполните email владельца билета :seat',
'holder_email_invalid' => 'Неправильный email владельца билета :seat',
'question_required' => "Ответьте, пожалуйста, на вопросы",
'enable_javascript' => 'Включите, пожалуйста, Javascript на вашем браузере.',
'payment_error' => 'Извините, произошла ошибка во врем оплаты. Поажлуйста, попробуйте еще раз.',
'payment_cancelled' => 'Платеж отклонен',
'no_ordere_id' => 'Номер заказа не существует',
'order_error' => 'Извините! Произошла ошибка при обработке вашего заказа. Поажлуйста, попробуйте еще раз.',
'message_reserved' => 'Кто-то уже выбрал это место. Пожалуйста, выберите другое место',
'message_wait' => 'Подождите',
//About page
'about_us' => 'О нас',
'contacts'=> 'Контакты',
@ -135,7 +136,7 @@ return [
'how_to_buy' => 'Как купить билет',
'refund' => 'Возврат билетов',
'cooperation' => 'Партнёрам',
'oferta' => 'Публичная оферта',
'oferta' => 'Оферта',
'organisers' => 'Организаторам',
'add_event' => 'Добавить мероприятие',
@ -145,8 +146,8 @@ return [
'terms_conditions' => 'Я принимаю условия Публичной Оферты',
//todo add event request and subscribe translate ru
'add_event_success_message' => 'Thanks for request. We will contact you as soon as possible',
'add_event_error_message' => 'There is some problem occured on adding event request',
'subscribe_success_message' => 'Subscription successfully',
'subscribe_error_message' => 'Subscription unsuccessful',
'add_event_success_message' => 'Спасибо за заявку. Мы свяжемся с вами в ближайшее время',
'add_event_error_message' => 'Произошла ошибка во время отправки заявки. Пожалуйста, попробуйте еще раз',
'subscribe_success_message' => 'Подписка прошла успешна',
'subscribe_error_message' => 'Подписка не осуществилась. Пожалуйста, попробуйте еще раз',
];

44
resources/lang/tk/ClientSide.php
View File

@ -113,37 +113,39 @@ return [
//Chcekout page
'checkout' => 'Checkout',
'no_seats' => 'No seats selected',
'min_ticket_message' => 'You must select at least :min tickets.',
'max_ticket_message' => 'The maximum number of tickets you can register is :max',
'holder_first_name_required' => 'Ticket holder :seat\'s first name is required',
'holder_last_name_required' => 'Ticket holder :seat\'s last name is required',
'holder_email_required' => 'Ticket holder :seat\'s email is required',
'holder_email_invalid' => 'Ticket holder :seat\'s email appears to be invalid',
'question_required' => "This question is required",
'enable_javascript' => 'Please enable Javascript in your browser.',
'payment_error' => 'Sorry, there was an error processing your payment. Please try again.',
'payment_cancelled' => 'Payment cancelled',
'no_ordere_id' => 'Order id does not exist',
'order_error' => 'Whoops! There was a problem processing your order. Please try again.',
'no_seats' => 'Ýer saýlamagyňyzy haýyş edýäris',
'min_ticket_message' => 'Iň azyndan :min ýer saýlaň.',
'max_ticket_message' => 'Siz iň köp :max ýer saýlap bilersiňiz' ,
'holder_first_name_required' => ':seat biletiň eýesiniň adyny giriziň',
'holder_last_name_required' => ':seat biletiň eýesiniň familiýasyny giriziň',
'holder_email_required' => ':seat biletiň eýesiniň elektron poçtasyny giriziň',
'holder_email_invalid' => ':seat biletiň eýesiniň elektron poçgtasy nädogry girizilen',
'question_required' => "Soraglara jogap bermegiňizi haýyş edýäris",
'enable_javascript' => 'Brauzeriňizde Javascript-i açmagyňyzy haýyş edýäris.',
'payment_error' => 'Töleg amala aşyrylan wagty ýalňyşlyk ýüze çykdy. Täzeden synanyşmagyňyzy haýyş edýäris.',
'payment_cancelled' => 'Töleg kabul edilmedi',
'no_ordere_id' => 'Sargydyň belgisi ýok',
'order_error' => 'Bagyşlaň! Siziň sargydyňyz işlenilen wagty ýalňyşlyk ýüze çykdy. Täzeden synanyşmagyňyzy haýyş edýäris.',
'message_reserved' => 'Bu ýer eýýäm eýelendi. Başga ýeri saýlamagyňyzy haýyş edýäris.',
'message_wait' => 'Garaşyň',
//About page
'about_us' => 'Biz barada',
'contacts'=> 'Habarlaşmak üçin',
'about_payment' => 'Töleg barada',
'how_to_buy' => 'Biledi nähili satyn almaly',
'refund' => 'Biledi yzyna gaýtarmak',
'cooperation' => 'Hyzmatdaşlar üçin',
'how_to_buy' => 'Nähili satyn almaly',
'refund' => 'Yzyna tabşyrmak',
'cooperation' => 'Hyzmatdaşlara',
'oferta' => 'Oferta',
'organisers' => 'Gurnaýjylar üçin',
'organisers' => 'Guramaçylara',
'add_event' => 'Çäre goşmak',
'terms_conditions' => 'Ofertanyň şertlerini kabul edýärin',
//todo add event request and subscribe translate tk
'add_event_success_message' => 'Thanks for request. We will contact you as soon as possible',
'add_event_error_message' => 'There is some problem occured on adding event request',
'subscribe_success_message' => 'Subscription successfully',
'subscribe_error_message' => 'Subscription unsuccessful',
'add_event_success_message' => 'Talapnama ugradanyňyz üçin sag boluň. Biz Siz bilen gysga wagtda habarlaşarys.',
'add_event_error_message' => 'Talapnma ugradylanda ýalňyşlyk ýüze çykdy',
'subscribe_success_message' => 'Ýazylanyňyz üçin sag boluň. Sizi täze çäreler bilen habardar ederis.',
'subscribe_error_message' => 'Ýazylyşyk amala aşmady. Täzeden synanşmagyňyzy haýyş edýäris.',
];

10
resources/views/desktop/Pages/AboutPage.blade.php
View File

@ -16,7 +16,8 @@
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'introduction'])}}">{{__('ClientSide.introduction')}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'partners'])}}">{{__("ClientSide.partners")}}</a></li>
<a class="text-dark capitalizer" href="{{route('about',['page'=>'oferta'])}}">{{__("ClientSide.oferta")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'contacts'])}}">{{__("ClientSide.contacts")}}</a></li>
@ -26,8 +27,7 @@
<a class="text-dark capitalizer" href="{{route('about',['page'=>'how_to_buy'])}}">{{__("ClientSide.how_to_buy")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'questions'])}}">{{__("ClientSide.questions")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'concert_halls'])}}">{{__("ClientSide.concert_halls")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'refund'])}}">{{__("ClientSide.refund")}}</a></li>
@ -36,7 +36,9 @@
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'organizers'])}}">{{__("ClientSide.organizers")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'oferta'])}}">{{__("ClientSide.oferta")}}</a></li>
<a class="text-dark capitalizer" href="{{route('about',['page'=>'partners'])}}">{{__("ClientSide.partners")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" href="{{route('about',['page'=>'concert_halls'])}}">{{__("ClientSide.concert_halls")}}</a></li>
<li class="list-group-item border-0 pl-0">
<a class="text-dark capitalizer" data-toggle="modal" data-target="#exampleModalCenter">{{__("ClientSide.addEvent")}}</a></li>
</ul>

2
resources/views/desktop/Partials/BreadCrumbs.blade.php
View File

@ -2,7 +2,7 @@
<section class="page-breadcrumbs">
<div class="container">
<div class="row">
<ul style="padding-left: 15px" class="breadcrumbs-ul ">
<ul style="padding-left: 15px" class="breadcrumbs-ul text-uppercase">
@foreach ($breadcrumbs as $breadcrumb)
@if ($breadcrumb->url && !$loop->last)
<li style="text-transform: capitalize">

2
resources/views/mobile/Partials/CreateOrderSection.blade.php
View File

@ -60,7 +60,7 @@
</div>
</div>
<div class="col-12">
<div class="event_order_form card py-3 px-md-5">
<div class="event_order_form py-3 px-md-5">
{!! Form::open(['url' => route('postCreateOrder', ['event_id' => $event->id]),
'class' => ($order_requires_payment && @$payment_gateway->is_on_site) ? 'ajax payment-form' : 'ajax', 'data-stripe-pub-key' => isset($account_payment_gateway->config['publishableKey']) ? $account_payment_gateway->config['publishableKey'] : '']) !!}

4
resources/views/mobile/Partials/PublicFooter.blade.php
View File

@ -5,11 +5,11 @@
</div>
</div>
</div>
<footer class="mob-foote mt-5">
<footer class="mob-footer mt-5">
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="text-center g-color-white font-weight-bold">{{__('ClientSide.want')}}</h2>
<h3 class="text-center g-color-white font-weight-bold">{{__('ClientSide.want')}}</h3>
<p class="text-center g-color-white">{{__("ClientSide.email_for")}}</p>
</div>
</div>

2
resources/views/mobile/Partials/PublicHeader.blade.php
View File

@ -22,7 +22,7 @@
@endforeach
</ul>
<form class="form-inline my-2 my-lg-0" action="{{route('search')}}" method="GET">
<input class="form-control mr-sm-2 search-input-box" type="search" name="key" placeholder="{{__('ClientSide.placeholder')}}" aria-label="Search">
<input class="form-control mr-sm-2 search-input-box" type="search" name="q" placeholder="{{__('ClientSide.placeholder')}}" aria-label="Search">
<button class="btn btn-outline-danger my-2 my-sm-0" type="submit" style="width: 100%;">{{__('ClientSide.search')}}</button>
</form>
</div>