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

dobavit sobitya mobile

This commit is contained in:
merdan 2020-03-03 23:40:09 +05:00
parent 97e0798a0a
commit 361d8a6637
8 changed files with 104 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ class EventCheckoutController extends Controller
if (!$request->has('seats')) {
return response()->json([
'status' => 'error',
'message' => 'No seats selected',
'message' => trans('ClientSide.no_seats'),
]);
}
@ -150,9 +150,9 @@ class EventCheckoutController extends Controller
* Validation max min ticket count
*/
if($seats_count < $ticket->min_per_person){
$message = 'You must select at least ' . $ticket->min_per_person . ' tickets.';
$message = trans('ClientSide.min_ticket_message',['min' => $ticket->min_per_person]);
}elseif ($seats_count > $max_per_person){
$message = 'The maximum number of tickets you can register is ' . $ticket->quantity_remaining;
$message = trans('ClientSide.max_ticket_message',['max' => $ticket->quantity_remaining]);
}
if (isset($message)) {
@ -194,17 +194,17 @@ class EventCheckoutController extends Controller
$validation_rules['ticket_holder_last_name.' . $seat_no . '.' . $ticket_id] = ['required'];
$validation_rules['ticket_holder_email.' . $seat_no . '.' . $ticket_id] = ['required', 'email'];
$validation_messages['ticket_holder_first_name.' . $seat_no . '.' . $ticket_id . '.required'] = 'Ticket holder ' . $seat_no . '\'s first name is required';
$validation_messages['ticket_holder_last_name.' . $seat_no . '.' . $ticket_id . '.required'] = 'Ticket holder ' . $seat_no . '\'s last name is required';
$validation_messages['ticket_holder_email.' . $seat_no . '.' . $ticket_id . '.required'] = 'Ticket holder ' . $seat_no . '\'s email is required';
$validation_messages['ticket_holder_email.' . $seat_no . '.' . $ticket_id . '.email'] = 'Ticket holder ' . $seat_no . '\'s email appears to be invalid';
$validation_messages['ticket_holder_first_name.' . $seat_no . '.' . $ticket_id . '.required'] = trans('ClientSide.holder_first_name_required',['seat' => $seat_no]);
$validation_messages['ticket_holder_last_name.' . $seat_no . '.' . $ticket_id . '.required'] = trans('ClientSide.holder_last_name_required',['seat' => $seat_no]);
$validation_messages['ticket_holder_email.' . $seat_no . '.' . $ticket_id . '.required'] = trans('ClientSide.holder_email_required',['seat' => $seat_no]);;
$validation_messages['ticket_holder_email.' . $seat_no . '.' . $ticket_id . '.email'] = trans('ClientSide.holder_email_invalid',['seat' => $seat_no]);;
/*
* Validation rules for custom questions
*/
foreach ($ticket->questions as $question) {
if ($question->is_required && $question->is_enabled) {
$validation_rules['ticket_holder_questions.' . $ticket_id . '.' . $seat_no . '.' . $question->id] = ['required'];
$validation_messages['ticket_holder_questions.' . $ticket_id . '.' . $seat_no . '.' . $question->id . '.required'] = "This question is required";
$validation_messages['ticket_holder_questions.' . $ticket_id . '.' . $seat_no . '.' . $question->id . '.required'] = trans('ClientSide.question_required');
}
}
}
@ -257,7 +257,7 @@ class EventCheckoutController extends Controller
/*
* todo Maybe display something prettier than this?
*/
exit('Please enable Javascript in your browser.');
exit(trans('ClientSide.enable_javascript'));
}
// public function postValidateTickets(Request $request, $event_id)
@ -591,7 +591,7 @@ class EventCheckoutController extends Controller
} catch (\Exeption $e) {
// dd($e);
Log::error($e);
$error = 'Sorry, there was an error processing your payment. Please try again.';
$error = trans('ClientSide.payment_error');
}
if ($error) {
@ -640,11 +640,11 @@ class EventCheckoutController extends Controller
public function mobileCheckoutPaymentReturn(Request $request, $event_id){
if ($request->get('is_payment_cancelled') == '1') {
return view('mobile.CheckoutFailed',['message'=>'Toleg besedildi']);
return view('mobile.CheckoutFailed',['message'=>trans('ClientSide.payment_cancelled')]);
}
if(!$request->has('orderId')){
return view('mobile.CheckoutFailed',['message'=>'order id yok']);
return view('mobile.CheckoutFailed',['message'=> trans('ClientSide.no_order_id')]);
}
$response = $this->gateway->getPaymentStatus($request->get('orderId'));
@ -826,7 +826,7 @@ class EventCheckoutController extends Controller
return response()->json([
'status' => 'error',
'message' => 'Whoops! There was a problem processing your order. Please try again.'
'message' => trans('ClientSide.order_error')
]);
}

32
app/Http/Controllers/PublicController.php
View File

@ -129,10 +129,16 @@ class PublicController extends Controller
'details' => sanitise($request->get('details'))
]);
return response()->json([
'status' => 'success',
'message' => 'Thanks for request. We will contact you as soon as possible',
]);
if($addEvent)
return response()->json([
'status' => 'success',
'message' => trans('ClientSide.add_event_success_message'),
]);
else
return response()->json([
'status' => 'error',
'message' => trans('ClientSide.add_event_error_message'),
]);
}
public function subscribe(SubscribeRequest $request){
@ -140,13 +146,15 @@ class PublicController extends Controller
//todo validate email
$subscribe = Subscriber::updateOrCreate(['email'=>$email,'active'=>1]);
// if($subscribe){
// session()->flash('message','Subscription successfully');
// }
return response()->json([
'status' => 'success',
'message' => 'Subscription successfully',
]);
if($subscribe)
return response()->json([
'status' => 'success',
'message' => trans('ClientSide.subscribe_success_message'),
]);
else
return response()->json([
'status' => 'error',
'message' => trans('ClientSide.subscribe_error_message'),
]);
}
}

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

@ -106,6 +106,19 @@ 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.',
//About page
'about_us' => 'About us',
@ -118,5 +131,10 @@ return [
'terms_conditions' => 'Terms and conditions',
//add event request and subscribe
'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',
];

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

@ -114,6 +114,19 @@ 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.',
//About page
'about_us' => 'О нас',
@ -130,4 +143,10 @@ return [
'about_payment' => 'Об оплате',
'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',
];

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

@ -113,6 +113,19 @@ 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.',
//About page
'about_us' => 'Biz barada',
@ -128,4 +141,9 @@ return [
'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',
];

9
resources/views/Shared/Layouts/BilettmLayout.blade.php
View File

@ -29,14 +29,7 @@
</head>
<body>
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content" style="padding: 50px 70px">
@include('Shared.Partials.AddEventForm')
</div>
</div>
</div>
<main id="{{$folder}}">
@include($folder.'.Partials.PublicHeader')
@yield('content')

8
resources/views/desktop/Partials/PublicFooter.blade.php
View File

@ -1,3 +1,11 @@
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content" style="padding: 50px 60px">
@include('Shared.Partials.AddEventForm')
</div>
</div>
</div>
<!-- Footer -->
<footer class="g-bg-main-light-v1 mt-5">
<!-- Content -->

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

@ -1,3 +1,10 @@
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content" style="padding: 40px 20px">
@include('Shared.Partials.AddEventForm')
</div>
</div>
</div>
<footer class="mob-footer">
<div class="container">
<div class="row">