diff --git a/resources/lang/en/Public_ViewEvent.php b/resources/lang/en/Public_ViewEvent.php index 6c73b241..dccc474d 100644 --- a/resources/lang/en/Public_ViewEvent.php +++ b/resources/lang/en/Public_ViewEvent.php @@ -66,6 +66,7 @@ return [ 'ticket' => 'Ticket', 'ticket_holder_information' => 'Ticket Holder Information', 'ticket_holder_n' => 'Ticket Holder :n Details', + 'seat_holder_n' => ':ticket :seat_no ticket holder Details', 'ticket_price' => 'Ticket Price', 'tickets' => 'Ticket(s)', 'tickets_are_currently_unavailable' => 'Tickets are currently unavailable', diff --git a/resources/lang/ru/Public_ViewEvent.php b/resources/lang/ru/Public_ViewEvent.php index 05402a70..c81d5f66 100644 --- a/resources/lang/ru/Public_ViewEvent.php +++ b/resources/lang/ru/Public_ViewEvent.php @@ -66,6 +66,7 @@ return [ 'ticket' => 'билет', 'ticket_holder_information' => 'Информация о владельце билета', 'ticket_holder_n' => 'Информация о владельце билета :n ', + 'seat_holder_n' => 'Информация о владельце билета :ticket :seat_no', 'ticket_price' => 'Цена билета', 'tickets' => 'Билет (ы)', 'tickets_are_currently_unavailable' => 'Билеты в настоящее время недоступны', diff --git a/resources/lang/tk/Public_ViewEvent.php b/resources/lang/tk/Public_ViewEvent.php index ea970a8c..aaf5f1c5 100644 --- a/resources/lang/tk/Public_ViewEvent.php +++ b/resources/lang/tk/Public_ViewEvent.php @@ -66,6 +66,7 @@ return [ 'ticket' => 'Bilet', 'ticket_holder_information' => 'Bilediň eýesi barada maglumat', 'ticket_holder_n' => 'Bilediň eýesi barada :n maglumatlar', + 'seat_holder_n' => ':ticket :seat_no bilediň eýesi barada maglumat', 'ticket_price' => 'Bilediň bahasy', 'tickets' => 'Bilet(ler)', 'tickets_are_currently_unavailable' => 'Biletler şu wagt elýeterli däl', diff --git a/resources/views/desktop/Partials/CreateOrderSection.blade.php b/resources/views/desktop/Partials/CreateOrderSection.blade.php index 19587491..1a5a18be 100644 --- a/resources/views/desktop/Partials/CreateOrderSection.blade.php +++ b/resources/views/desktop/Partials/CreateOrderSection.blade.php @@ -5,6 +5,60 @@
+
+
+ +
+

+ + @lang("Public_ViewEvent.order_summary") +

+ + + + + + + + + @foreach($tickets as $ticket) + + + + + + @endforeach +
@lang('Public_ViewEvent.booking_fees')@lang('Public_ViewEvent.price')
{{{$ticket['ticket']['title']}}} X {{$ticket['qty']}}{{money($ticket['total_booking_fee'], $event->currency)}} + @if((int)ceil($ticket['original_price']) === 0) + @lang("Public_ViewEvent.free") + @else + {{ money($ticket['original_price'], $event->currency) }} + @endif +
+
+ @if($order_total > 0) +
+
+ @lang("Public_ViewEvent.total"): {{ $orderService->getOrderTotalWithBookingFee(true) }} +
+ @if($event->organiser->charge_tax) +
+ {{ $event->organiser->tax_name }} ({{ $event->organiser->tax_value }}%): + {{ $orderService->getTaxAmount(true) }} +
+
+ @lang("Public_ViewEvent.grand_total") + {{ $orderService->getGrandTotal(true) }} +
+ @endif +
+ @endif + +
+
+ {!! @trans("Public_ViewEvent.time", ["time"=>""]) !!} +
+
{!! Form::open(['url' => route('postCreateOrder', ['event_id' => $event->id]), @@ -57,7 +111,7 @@
- @lang("Public_ViewEvent.ticket_holder_n", ["n"=>$seat]) {{$ticket['ticket']['title']}} + @lang("Public_ViewEvent.seat_holder_n", ["seat_no"=>$seat,'ticket'=>"{$ticket['ticket']['title']}"])
@@ -183,60 +237,7 @@ {!! Form::close() !!}
-
-
-
-

- - @lang("Public_ViewEvent.order_summary") -

- - - - - - - - - @foreach($tickets as $ticket) - - - - - - @endforeach -
@lang('Public_ViewEvent.booking_fees')@lang('Public_ViewEvent.price')
{{{$ticket['ticket']['title']}}} X {{$ticket['qty']}}{{money($ticket['total_booking_fee'], $event->currency)}} - @if((int)ceil($ticket['original_price']) === 0) - @lang("Public_ViewEvent.free") - @else - {{ money($ticket['original_price'], $event->currency) }} - @endif -
-
- @if($order_total > 0) -
-
- @lang("Public_ViewEvent.total"): {{ $orderService->getOrderTotalWithBookingFee(true) }} -
- @if($event->organiser->charge_tax) -
- {{ $event->organiser->tax_name }} ({{ $event->organiser->tax_value }}%): - {{ $orderService->getTaxAmount(true) }} -
-
- @lang("Public_ViewEvent.grand_total") - {{ $orderService->getGrandTotal(true) }} -
- @endif -
- @endif - -
-
- {!! @trans("Public_ViewEvent.time", ["time"=>""]) !!} -
-
diff --git a/resources/views/mobile/Pages/CheckoutPage.blade.php b/resources/views/mobile/Pages/CheckoutPage.blade.php index a8458ed7..21b4d656 100644 --- a/resources/views/mobile/Pages/CheckoutPage.blade.php +++ b/resources/views/mobile/Pages/CheckoutPage.blade.php @@ -2,7 +2,7 @@ @section('content') @include('desktop.Partials.HeaderSection') - @include('desktop.Partials.CreateOrderSection') + @include('mobile.Partials.CreateOrderSection') @include('desktop.Partials.FooterSection') @endsection diff --git a/resources/views/mobile/Partials/CreateOrderSection.blade.php b/resources/views/mobile/Partials/CreateOrderSection.blade.php new file mode 100644 index 00000000..bfa36ca7 --- /dev/null +++ b/resources/views/mobile/Partials/CreateOrderSection.blade.php @@ -0,0 +1,239 @@ +
+
+

+ @lang("Public_ViewEvent.order_details") +

+
+
+
+
+ {!! 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'] : '']) !!} + + {!! Form::hidden('event_id', $event->id) !!} + +

@lang("Public_ViewEvent.your_information")

+ +
+
+
+ {!! Form::label("order_first_name", trans("Public_ViewEvent.first_name")) !!} + {!! Form::text("order_first_name", null, ['required' => 'required', 'class' => 'form-control']) !!} +
+
+
+
+ {!! Form::label("order_last_name", trans("Public_ViewEvent.last_name")) !!} + {!! Form::text("order_last_name", null, ['required' => 'required', 'class' => 'form-control']) !!} +
+
+
+ +
+
+
+ {!! Form::label("order_email", trans("Public_ViewEvent.email")) !!} + {!! Form::text("order_email", null, ['required' => 'required', 'class' => 'form-control']) !!} +
+
+
+
+ + @lang("Public_ViewEvent.copy_buyer") + +
+ +
+
+ + @foreach($tickets as $ticket) + @foreach($ticket['seats'] as $seat) + +
+ +
+
+ @lang("Public_ViewEvent.seat_holder_n", ["seat_no"=>$seat,'ticket'=>"{$ticket['ticket']['title']}"]) +
+
+
+
+
+
+ {!! Form::label("ticket_holder_first_name[{$seat}][{$ticket['ticket']['id']}]", trans("Public_ViewEvent.first_name")) !!} + {!! Form::text("ticket_holder_first_name[{$seat}][{$ticket['ticket']['id']}]", null, ['required' => 'required', 'class' => "ticket_holder_first_name.$seat.{$ticket['ticket']['id']} ticket_holder_first_name form-control"]) !!} +
+
+
+
+ {!! Form::label("ticket_holder_last_name[{$seat}][{$ticket['ticket']['id']}]", trans("Public_ViewEvent.last_name")) !!} + {!! Form::text("ticket_holder_last_name[{$seat}][{$ticket['ticket']['id']}]", null, ['required' => 'required', 'class' => "ticket_holder_last_name.$seat.{$ticket['ticket']['id']} ticket_holder_last_name form-control"]) !!} +
+
+
+
+
+
+ {!! Form::label("ticket_holder_email[{$seat}][{$ticket['ticket']['id']}]", trans("Public_ViewEvent.email_address")) !!} + {!! Form::text("ticket_holder_email[{$seat}][{$ticket['ticket']['id']}]", null, ['required' => 'required', 'class' => "ticket_holder_email.$seat.{$ticket['ticket']['id']} ticket_holder_email form-control"]) !!} +
+
+ @include('Public.ViewEvent.Partials.AttendeeQuestions', ['ticket' => $ticket['ticket'],'attendee_number' => $total_attendee_increment++]) + +
+ +
+ + +
+ @endforeach + @endforeach +
+
+ + + +{{-- @if($order_requires_payment)--}} + +{{--

@lang("Public_ViewEvent.payment_information")

--}} +{{-- @lang("Public_ViewEvent.below_payment_information_header")--}} +{{-- @if($event->enable_offline_payments)--}} +{{--
--}} +{{--
--}} +{{-- @if($payment_gateway === false)--}} +{{-- --}}{{-- Force offline payment if no gateway --}} +{{-- --}} +{{-- --}} +{{-- @else--}} +{{-- --}} +{{-- @endif--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{-- --}} + +{{-- @endif--}} + + +{{-- @if(@$payment_gateway->is_on_site)--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{-- {!! Form::label('card-number', trans("Public_ViewEvent.card_number")) !!}--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{-- {!! Form::label('card-expiry-month', trans("Public_ViewEvent.expiry_month")) !!}--}} +{{-- {!! Form::selectRange('card-expiry-month',1,12,null, [--}} +{{-- 'class' => 'form-control card-expiry-month',--}} +{{-- 'data-stripe' => 'exp_month'--}} +{{-- ] ) !!}--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{-- {!! Form::label('card-expiry-year', trans("Public_ViewEvent.expiry_year")) !!}--}} +{{-- {!! Form::selectRange('card-expiry-year',date('Y'),date('Y')+10,null, [--}} +{{-- 'class' => 'form-control card-expiry-year',--}} +{{-- 'data-stripe' => 'exp_year'--}} +{{-- ] ) !!}
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{-- {!! Form::label('card-expiry-year', trans("Public_ViewEvent.cvc_number")) !!}--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} + +{{-- @endif--}} + +{{-- @endif--}} + + @if($event->pre_order_display_message) +
+ {!! nl2br(e($event->pre_order_display_message)) !!} +
+ @endif + + {!! Form::hidden('is_embedded', $is_embedded) !!} + {!! Form::submit(trans("Public_ViewEvent.checkout_submit"), ['class' => 'check-order-btn btn btn-lg btn-danger card-submit']) !!} + {!! Form::close() !!} +
+
+
+
+ +
+

+ + @lang("Public_ViewEvent.order_summary") +

+ + + + + + + + + @foreach($tickets as $ticket) + + + + + + @endforeach +
@lang('Public_ViewEvent.booking_fees')@lang('Public_ViewEvent.price')
{{{$ticket['ticket']['title']}}} X {{$ticket['qty']}}{{money($ticket['total_booking_fee'], $event->currency)}} + @if((int)ceil($ticket['original_price']) === 0) + @lang("Public_ViewEvent.free") + @else + {{ money($ticket['original_price'], $event->currency) }} + @endif +
+
+ @if($order_total > 0) +
+
+ @lang("Public_ViewEvent.total"): {{ $orderService->getOrderTotalWithBookingFee(true) }} +
+ @if($event->organiser->charge_tax) +
+ {{ $event->organiser->tax_name }} ({{ $event->organiser->tax_value }}%): + {{ $orderService->getTaxAmount(true) }} +
+
+ @lang("Public_ViewEvent.grand_total") + {{ $orderService->getGrandTotal(true) }} +
+ @endif +
+ @endif + +
+
+ {!! @trans("Public_ViewEvent.time", ["time"=>""]) !!} +
+
+ +
+