From e1ad3da2531b4bc6509ac06791d7917bcc3a2c53 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 24 Mar 2020 17:05:40 +0500 Subject: [PATCH] commit before test last checkout update process --- .../Controllers/EventCheckoutController.php | 7 +- app/Http/Controllers/PublicController.php | 6 +- resources/lang/ru/Controllers.php | 2 +- resources/lang/tk/Controllers.php | 2 +- .../views/desktop/Pages/SeatsPage.blade.php | 2 +- .../views/desktop/Pages/VenuesPage.blade.php | 30 +++++++ .../Partials/CreateOrderSection.blade.php | 6 +- .../views/mobile/Pages/SeatsPage.blade.php | 2 +- .../views/ru/Emails/Layouts/Master.blade.php | 4 +- .../TicketMailer/SendOrderTickets.blade.php | 79 +++++++++---------- 10 files changed, 88 insertions(+), 52 deletions(-) create mode 100644 resources/views/desktop/Pages/VenuesPage.blade.php diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index f0ff2eba..fef6c17c 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -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'); } diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index 3bead77e..189e85d7 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -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); } } diff --git a/resources/lang/ru/Controllers.php b/resources/lang/ru/Controllers.php index 5d35aabb..2879ef93 100644 --- a/resources/lang/ru/Controllers.php +++ b/resources/lang/ru/Controllers.php @@ -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' => 'Ссылка для сброса вашего пароля', ); diff --git a/resources/lang/tk/Controllers.php b/resources/lang/tk/Controllers.php index 28d17fb4..3995687e 100644 --- a/resources/lang/tk/Controllers.php +++ b/resources/lang/tk/Controllers.php @@ -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', ); diff --git a/resources/views/desktop/Pages/SeatsPage.blade.php b/resources/views/desktop/Pages/SeatsPage.blade.php index 7eb630c1..53f2ac74 100644 --- a/resources/views/desktop/Pages/SeatsPage.blade.php +++ b/resources/views/desktop/Pages/SeatsPage.blade.php @@ -70,7 +70,7 @@ @lang("Public_ViewEvent.sales_have_ended") @else -
+
{{$ticket->section->section_no}} {{$ticket->section->description}}
'desktop']) +@section('after_styles') + +@endsection +@section('content') + {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('about',$title)}} +
+
+
+
+ + + +
+
+
+

{{$venue->venue_name}}

+ {!! Markdown::parse($venue->description) !!} +
+
+
+
+@endsection diff --git a/resources/views/desktop/Partials/CreateOrderSection.blade.php b/resources/views/desktop/Partials/CreateOrderSection.blade.php index 30ca9fe6..17cb7189 100644 --- a/resources/views/desktop/Partials/CreateOrderSection.blade.php +++ b/resources/views/desktop/Partials/CreateOrderSection.blade.php @@ -208,14 +208,14 @@ - + + @foreach($tickets as $ticket) - + + @endforeach
@lang('Public_ViewEvent.booking_fees') @lang('Public_ViewEvent.price')@lang('Public_ViewEvent.booking_fees')@lang('Public_ViewEvent.total')
{{{$ticket['ticket']['title']}}} X {{$ticket['qty']}}{{money($ticket['total_booking_fee'], $event->currency)}} @if((int)ceil($ticket['original_price']) === 0) @lang("Public_ViewEvent.free") @@ -223,6 +223,8 @@ {{ money($ticket['original_price'], $event->currency) }} @endif {{money($ticket['total_booking_fee'], $event->currency)}}{{money($ticket['price']+$ticket['organiser_booking_fee']+$ticket['booking_fee'], $event->currency)}}
diff --git a/resources/views/mobile/Pages/SeatsPage.blade.php b/resources/views/mobile/Pages/SeatsPage.blade.php index 675e59a5..42d707c1 100644 --- a/resources/views/mobile/Pages/SeatsPage.blade.php +++ b/resources/views/mobile/Pages/SeatsPage.blade.php @@ -73,7 +73,7 @@ @lang("Public_ViewEvent.sales_have_ended") @else -
+
{{$ticket->section->section_no}} {{$ticket->section->description}}
-
+ -
+
diff --git a/resources/views/ru/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/ru/Mailers/TicketMailer/SendOrderTickets.blade.php index d84a9198..c5d2001b 100644 --- a/resources/views/ru/Mailers/TicketMailer/SendOrderTickets.blade.php +++ b/resources/views/ru/Mailers/TicketMailer/SendOrderTickets.blade.php @@ -1,7 +1,7 @@ @extends('ru.Emails.Layouts.Master') @section('message_content') - Здравствуйте,

+ Уважаемый клиент,

Ваша покупка билета на мероприятие {{$order->event->title}} прошла успешна.

@@ -15,12 +15,12 @@

Информация о заказе

Код заказа: {{$order->order_reference}}
Имя покупателя: {{$order->full_name}}
- Дата заказа: {{$order->created_at->toDayDateTimeString()}}
+ Дата заказа: {{$order->created_at->format('d-m-Y H:i')}}
Электронная почта покупателя: {{$order->email}}
-Добавить в календарь +{{--Добавить в календарь--}}

Подробности заказа

- +
@foreach($order->orderItems as $order_item) - - - - + + + - + - + - - @endforeach + + + @endforeach {{-- --}} {{-- --}} {{-- --}} -{{-- --}} -{{-- --}} + {{-- --}} @@ -121,5 +120,5 @@



-Спасибо! +Благодарим за покупку!

Спасибо, что используете сервис bilettm.com! С уважением, команда bilettm.com @stop
Билет @@ -35,53 +35,52 @@ Плата за обслуживание - Итого + Сумма
- {{$order_item->title}} - - {{$order_item->quantity}} - - @if((int)ceil($order_item->unit_price) == 0) - БЕСПЛАТНО - @else - {{money($order_item->unit_price, $order->event->currency)}} - @endif +
+ {{$order_item->title}} + + {{$order_item->quantity}} + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money($order_item->unit_price, $order->event->currency)}} + @endif - - @if((int)ceil($order_item->unit_price) == 0) - - - @else - {{money($order_item->unit_booking_fee, $order->event->currency)}} - @endif + + @if((int)ceil($order_item->unit_price) == 0) + - + @else + {{money($order_item->unit_booking_fee, $order->event->currency)}} + @endif - - @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 + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money(($order_item->unit_price) * ($order_item->quantity), $order->event->currency)}} + @endif -
--}} +{{-- Сбор за сервис:--}} {{-- --}} {{-- --}} -{{-- --}} -{{-- Промежуточный итог--}} +{{-- {{$orderService->}}--}} {{-- --}} {{-- {{$orderService->getOrderTotalWithBookingFee(true)}}--}} {{--