commit before test last checkout update process
This commit is contained in:
parent
38f9639b9c
commit
e1ad3da253
|
|
@ -158,9 +158,9 @@ class EventCheckoutController extends Controller
|
|||
'qty' => $seats_count,
|
||||
'seats' => $ticket_seats,
|
||||
'price' => ($seats_count * $ticket->price),
|
||||
'booking_fee' => ($seats_count * $ticket->booking_fee),
|
||||
'organiser_booking_fee' => ($seats_count * $ticket->organiser_booking_fee),
|
||||
'total_booking_fee' => $ticket->total_booking_fee,
|
||||
'booking_fee' => ($seats_count * $ticket->booking_fee),//total_service_booking_fee per ticket
|
||||
'organiser_booking_fee' => ($seats_count * $ticket->organiser_booking_fee),//total_organiser_booking_fee per ticket
|
||||
'total_booking_fee' => $ticket->total_booking_fee,//service + organiser original booking fee sum
|
||||
'original_price' => $ticket->price,
|
||||
];
|
||||
|
||||
|
|
@ -454,6 +454,7 @@ class EventCheckoutController extends Controller
|
|||
'order_reference' => $order->order_reference,
|
||||
]);
|
||||
} else {
|
||||
//some times bank responds as payment not processed and we check 5 minutes later paymant status
|
||||
ProcessPayment::dispatch($order,$ticket_order)->delay(now()->addMinutes(5));
|
||||
return $this->render('Pages.OrderExpectingPayment');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -164,7 +164,11 @@ class PublicController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
public function venues(){
|
||||
public function venues($id = false){
|
||||
$data['venues'] = App\Models\Venue::where('active',1)->get();
|
||||
|
||||
$data['current'] = $id ? $data['venues']->where('id',$id)->first(): $data['venues']->first();
|
||||
|
||||
return $this->render('Pages.VenuesPage',$data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ return array (
|
|||
'ticket_successfully_deleted' => 'Билет успешно удален',
|
||||
'ticket_successfully_resent' => 'Билет успешно отправлен!',
|
||||
'ticket_successfully_updated' => 'Билет успешно обновлен!',
|
||||
'tickets_for_event' => 'Ваши билеты на событие: событие.',
|
||||
'tickets_for_event' => 'Ваши билеты на событие :event.',
|
||||
'whoops' => 'Упс! Похоже, что-то пошло не так. Пожалуйста, попробуйте еще раз.',
|
||||
'your_password_reset_link' => 'Ссылка для сброса вашего пароля',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ return array (
|
|||
'ticket_successfully_deleted' => 'Ticket Successfully Deleted',
|
||||
'ticket_successfully_resent' => 'Ticket Successfully Resent!',
|
||||
'ticket_successfully_updated' => 'Ticket Successfully Updated!',
|
||||
'tickets_for_event' => 'Your tickets for the event :event.',
|
||||
'tickets_for_event' => ':event üçin alan biletleriňiz.',
|
||||
'whoops' => 'Whoops! Looks like something went wrong. Please try again.',
|
||||
'your_password_reset_link' => 'Your Password Reset Link',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<span class="text-danger">@lang("Public_ViewEvent.sales_have_ended")</span>
|
||||
@else
|
||||
<meta property="availability" content="http://schema.org/InStock">
|
||||
<div class="standard-box" style="position: relative; padding: 20px 0">
|
||||
<div class="standard-box" style="position: relative; padding: 20px 0; user-select: none;">
|
||||
<h5 style="font-size: 24px;" class="text-center font-weight-bold">{{$ticket->section->section_no}} <small>{{$ticket->section->description}}</small></h5>
|
||||
|
||||
<table data-id="{{$ticket->id}}" style="margin: auto;position: relative; display: block; overflow-x: scroll"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
@extends('Shared.Layouts.BilettmLayout',['folder' => 'desktop'])
|
||||
@section('after_styles')
|
||||
|
||||
@endsection
|
||||
@section('content')
|
||||
{{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('about',$title)}}
|
||||
<section class="my-3">
|
||||
<div class="container">
|
||||
<div class="row text_black" >
|
||||
<div class="col-3">
|
||||
|
||||
|
||||
<ul class="list-group w-100 " style="float: left;height: 100%; background-color: #ffffff; z-index: 10;position: relative;color: #000000;font-size: 17px;">
|
||||
<li class="list-group-item border-0 pl-0">
|
||||
<h3>@lang('ClientSide.venues')</h3><div style="background-color: rgba(211,61,51,1);height: 5px;width: 80px;margin-bottom: 15px;"></div> </li>
|
||||
@foreach($venues as $venue)
|
||||
<li class="list-group-item border-0 pl-0">
|
||||
<a class="text-dark capitalizer" href="{{route('about',['page'=>'introduction'])}}">{{$venue->venue_name}}</a></li>
|
||||
@endforeach
|
||||
</ul>
|
||||
<div style="width: 5px;float: left;height: calc(100% - 20px); margin-top: 10px; margin-left: -6px; box-shadow: 2px 0 10px rgba(0,0,0,.1)"></div>
|
||||
</div>
|
||||
<div class="col-9 pl-4" style="font-size: 17px">
|
||||
<h2>{{$venue->venue_name}}</h2>
|
||||
{!! Markdown::parse($venue->description) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@endsection
|
||||
|
|
@ -208,14 +208,14 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th style="text-align: right;">@lang('Public_ViewEvent.booking_fees')</th>
|
||||
<th style="text-align: right;">@lang('Public_ViewEvent.price')</th>
|
||||
<th style="text-align: right;">@lang('Public_ViewEvent.booking_fees')</th>
|
||||
<th style="text-align: right;">@lang('Public_ViewEvent.total')</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@foreach($tickets as $ticket)
|
||||
<tr>
|
||||
<td class="pl0">{{{$ticket['ticket']['title']}}} X <b>{{$ticket['qty']}}</b></td>
|
||||
<td style="text-align: right;">{{money($ticket['total_booking_fee'], $event->currency)}}</td>
|
||||
<td style="text-align: right;">
|
||||
@if((int)ceil($ticket['original_price']) === 0)
|
||||
@lang("Public_ViewEvent.free")
|
||||
|
|
@ -223,6 +223,8 @@
|
|||
{{ money($ticket['original_price'], $event->currency) }}
|
||||
@endif
|
||||
</td>
|
||||
<td style="text-align: right;">{{money($ticket['total_booking_fee'], $event->currency)}}</td>
|
||||
<td style="text-align: right;">{{money($ticket['price']+$ticket['organiser_booking_fee']+$ticket['booking_fee'], $event->currency)}}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<span class="text-danger">@lang("Public_ViewEvent.sales_have_ended")</span>
|
||||
@else
|
||||
<meta property="availability" content="http://schema.org/InStock">
|
||||
<div class="standard-box" style="position: relative; padding: 20px 0;">
|
||||
<div class="standard-box" style="position: relative; padding: 20px 0; user-select: none;">
|
||||
<h5 style="font-size: 24px;" class="text-center font-weight-bold">{{$ticket->section->section_no}} <small>{{$ticket->section->description}}</small></h5>
|
||||
|
||||
<table data-id="{{$ticket->id}}" style="text-align: center; margin: auto;display: block;overflow-x: scroll"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
<table class="body-wrap" style="background-color: #f7f7f7;margin: 0;padding: 20px;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;width: 100%">
|
||||
<tr style="margin: 0;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
|
||||
<td style="margin: 0;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6"></td>
|
||||
<td class="container" bgcolor="#FFFFFF" style="margin: 0 auto !important;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;border: 1px solid #f0f0f0;display: block !important;max-width: 600px !important;clear: both !important">
|
||||
<td class="container" bgcolor="#FFFFFF" style="margin: 0 auto !important;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;border: 1px solid #f0f0f0;display: block !important;max-width: 800px !important;clear: both !important">
|
||||
|
||||
<!-- content -->
|
||||
<div class="content" style="color: #888;margin: 0 auto;padding: 20px;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;max-width: 600px;display: block">
|
||||
<div class="content" style="color: #888;margin: 0 auto;padding: 20px;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;max-width: 700px;display: block">
|
||||
<table style="margin: 0;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;width: 100%">
|
||||
<tr style="margin: 0;padding: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
|
||||
<td style="text-align: center;padding: 10px;margin: 0;font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
@extends('ru.Emails.Layouts.Master')
|
||||
|
||||
@section('message_content')
|
||||
Здравствуйте,<br><br>
|
||||
Уважаемый клиент,<br><br>
|
||||
|
||||
Ваша покупка билета на мероприятие <b>{{$order->event->title}}</b> прошла успешна.<br><br>
|
||||
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
<h3>Информация о заказе</h3>
|
||||
Код заказа: <b>{{$order->order_reference}}</b><br>
|
||||
Имя покупателя: <b>{{$order->full_name}}</b><br>
|
||||
Дата заказа: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
|
||||
Дата заказа: <b>{{$order->created_at->format('d-m-Y H:i')}}</b><br>
|
||||
Электронная почта покупателя: <b>{{$order->email}}</b><br>
|
||||
<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Добавить в календарь</a>
|
||||
{{--<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Добавить в календарь</a>--}}
|
||||
<h3>Подробности заказа</h3>
|
||||
<div style="padding:10px; background: #F9F9F9; border: 1px solid #f1f1f1;">
|
||||
<table style="width:100%; margin:10px;">
|
||||
<table style="width:100%;border-collapse: collapse;" border="1" cellpadding="5">
|
||||
<tr>
|
||||
<td>
|
||||
<b>Билет</b>
|
||||
|
|
@ -35,53 +35,52 @@
|
|||
<b>Плата за обслуживание</b>
|
||||
</td>
|
||||
<td>
|
||||
<b>Итого</b>
|
||||
<b>Сумма</b>
|
||||
</td>
|
||||
</tr>
|
||||
@foreach($order->orderItems as $order_item)
|
||||
<tr>
|
||||
<td>
|
||||
{{$order_item->title}}
|
||||
</td>
|
||||
<td>
|
||||
{{$order_item->quantity}}
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
БЕСПЛАТНО
|
||||
@else
|
||||
{{money($order_item->unit_price, $order->event->currency)}}
|
||||
@endif
|
||||
<tr>
|
||||
<td>
|
||||
{{$order_item->title}}
|
||||
</td>
|
||||
<td>
|
||||
{{$order_item->quantity}}
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
БЕСПЛАТНО
|
||||
@else
|
||||
{{money($order_item->unit_price, $order->event->currency)}}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
-
|
||||
@else
|
||||
{{money($order_item->unit_booking_fee, $order->event->currency)}}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
-
|
||||
@else
|
||||
{{money($order_item->unit_booking_fee, $order->event->currency)}}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
БЕСПЛАТНО
|
||||
@else
|
||||
{{money(($order_item->unit_price + $order_item->unit_booking_fee) * ($order_item->quantity), $order->event->currency)}}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if((int)ceil($order_item->unit_price) == 0)
|
||||
БЕСПЛАТНО
|
||||
@else
|
||||
{{money(($order_item->unit_price) * ($order_item->quantity), $order->event->currency)}}
|
||||
@endif
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
{{-- <tr>--}}
|
||||
{{-- <td>--}}
|
||||
{{-- Сбор за сервис:--}}
|
||||
{{-- </td>--}}
|
||||
{{-- <td>--}}
|
||||
{{-- </td>--}}
|
||||
{{-- <td>--}}
|
||||
{{-- </td>--}}
|
||||
{{-- <td>--}}
|
||||
{{-- <b>Промежуточный итог</b>--}}
|
||||
{{-- <td>{{$orderService->}}--}}
|
||||
{{-- </td>--}}
|
||||
|
||||
{{-- <td colspan="2">--}}
|
||||
{{-- {{$orderService->getOrderTotalWithBookingFee(true)}}--}}
|
||||
{{-- </td>--}}
|
||||
|
|
@ -121,5 +120,5 @@
|
|||
<br><br>
|
||||
</div>
|
||||
<br><br>
|
||||
Спасибо!
|
||||
Благодарим за покупку! <br><br>Спасибо, что используете сервис bilettm.com! С уважением, команда bilettm.com
|
||||
@stop
|
||||
|
|
|
|||
Loading…
Reference in New Issue