commit before test last checkout update process
This commit is contained in:
parent
ab25dac9a6
commit
ca7ce734b5
|
|
@ -426,21 +426,13 @@ class EventCheckoutController extends Controller
|
|||
|
||||
$order_id = session()->get('ticket_order_' . $event_id . '.order_id');
|
||||
$ticket_order = session()->get('ticket_order_' . $event_id);
|
||||
// dd($order_id);
|
||||
$order = Order::findOrFail(sanitise($order_id[0]));
|
||||
foreach ($ticket_order['tickets'] as $attendee_details) {
|
||||
/*
|
||||
* Insert order items (for use in generating invoices)
|
||||
*/
|
||||
// $orderItem = new OrderItem();
|
||||
// $orderItem->title = $attendee_details['ticket']['title'];
|
||||
// $orderItem->quantity = $attendee_details['qty'];
|
||||
// $orderItem->order_id = $order_id;
|
||||
// $orderItem->unit_price = $attendee_details['ticket']['price'];
|
||||
// $orderItem->unit_booking_fee = $attendee_details['ticket']['booking_fee'] + $attendee_details['ticket']['organiser_booking_fee'];
|
||||
// $orderItem->save();
|
||||
$unit_booking_fee = $attendee_details['ticket']['booking_fee'] + $attendee_details['ticket']['organiser_booking_fee'];
|
||||
// dd($attendee_details['ticket']['booking_fee'] , $attendee_details['ticket']['organiser_booking_fee'],$unit_booking_fee);
|
||||
|
||||
OrderItem::create([
|
||||
'title' => $attendee_details['ticket']['title'],
|
||||
'order_id' => $order->id,
|
||||
|
|
@ -471,11 +463,14 @@ class EventCheckoutController extends Controller
|
|||
if ($request->get('is_payment_cancelled') == '1') {
|
||||
return view('mobile.CheckoutFailed',['message'=>trans('ClientSide.payment_cancelled')]);
|
||||
}
|
||||
|
||||
if(!$request->has('orderId')){
|
||||
else if(!$request->has('orderId')){
|
||||
return view('mobile.CheckoutFailed',['message'=> trans('ClientSide.no_order_id')]);
|
||||
}
|
||||
$order = Order::where('event_id',$event_id)
|
||||
|
||||
$order = Order::select('orders.id','order_status_id','is_payment_received','amount','booking_fee','created_at',
|
||||
'organiser_booking_fee','event_id','session_id','account_id','first_name','last_name','email','order_reference')
|
||||
->with(['event:id,sales_volume,organiser_fees_volume,organiser_id,title,post_order_display_message'])
|
||||
->where('event_id',$event_id)
|
||||
->where('transaction_id',$request->get('orderId'))
|
||||
->first();
|
||||
|
||||
|
|
@ -505,7 +500,7 @@ class EventCheckoutController extends Controller
|
|||
$response = $this->gateway->getPaymentStatus($request->get('orderId'));
|
||||
|
||||
if ($response->isSuccessfull()) {
|
||||
$data = OrderService::mobileCompleteOrder($event_id,$request->get('orderId'));
|
||||
$data = OrderService::mobileCompleteOrder($order);
|
||||
return view('mobile.CheckoutSuccess', $data);
|
||||
} else {
|
||||
ProcessPayment::dispatch($order)->delay(now()->addMinutes(5));
|
||||
|
|
|
|||
|
|
@ -250,46 +250,37 @@ class EventOrderService
|
|||
|
||||
}
|
||||
|
||||
public static function mobileCompleteOrder($event_id,$transaction_id){
|
||||
public static function mobileCompleteOrder($order){
|
||||
DB::beginTransaction();
|
||||
|
||||
try {
|
||||
|
||||
$order = Order::select('orders.id','order_status_id','is_payment_received','amount','booking_fee','created_at',
|
||||
'organiser_booking_fee','event_id','session_id','account_id','first_name','last_name','email','order_reference')
|
||||
->with(['event:id,sales_volume,organiser_fees_volume,organiser_id,title,post_order_display_message'])
|
||||
->where('transaction_id',$transaction_id)
|
||||
->where('event_id',$event_id)
|
||||
->first();
|
||||
|
||||
$order->order_status_id = config('attendize.order_complete');
|
||||
$order->is_payment_received = true;
|
||||
$obf = $order->organiser_booking_fee;
|
||||
// $orderService = new OrderService($order->amount, $order->booking_fee + $obf, $order->event);
|
||||
// $orderService->calculateFinalCosts();
|
||||
|
||||
/*
|
||||
* Update the event sales volume
|
||||
*/
|
||||
$event = $order->event;
|
||||
// $event->increment('sales_volume', $orderService->getGrandTotal());
|
||||
$event->increment('organiser_fees_volume', $obf);
|
||||
$event->increment('sales_volume', $order->grand_total_amount);
|
||||
$event->increment('organiser_fees_volume', $order->organiser_booking_fee);
|
||||
|
||||
$reserved_tickets = ReservedTickets::select('id', 'seat_no', 'ticket_id')
|
||||
->with(['ticket:id,quantity_sold,sales_volume,organiser_fees_volume,price'])
|
||||
->where('session_id', $order->session_id)
|
||||
->where('event_id', $event_id)
|
||||
->where('event_id', $order->event_id)
|
||||
->get();
|
||||
/*
|
||||
* Update the event stats
|
||||
*/
|
||||
$event_stats = EventStats::updateOrCreate([
|
||||
'event_id' => $event_id,
|
||||
'event_id' => $order->event_id,
|
||||
'date' => DB::raw('CURRENT_DATE'),
|
||||
]);
|
||||
|
||||
$event_stats->increment('tickets_sold', $reserved_tickets->count() ?? 0);
|
||||
$event_stats->increment('sales_volume', $order->amount);
|
||||
$event_stats->increment('organiser_fees_volume', $obf);
|
||||
$event_stats->increment('organiser_fees_volume', $order->organiser_booking_fee);
|
||||
$attendee_increment = 1;
|
||||
/*
|
||||
* Add the attendees
|
||||
|
|
@ -304,7 +295,7 @@ class EventOrderService
|
|||
*/
|
||||
$ticket->increment('quantity_sold', 1);
|
||||
$ticket->increment('sales_volume', $ticket->price);
|
||||
$ticket->increment('organiser_fees_volume', $obf);// * $reserved->quantity_reserved
|
||||
$ticket->increment('organiser_fees_volume', $order->organiser_booking_fee);// * $reserved->quantity_reserved
|
||||
|
||||
/*
|
||||
* Create the attendees
|
||||
|
|
@ -345,7 +336,6 @@ class EventOrderService
|
|||
event(new OrderCompletedEvent($order));
|
||||
return [
|
||||
'order' => $order,
|
||||
'orderService' => $orderService,
|
||||
'event' => $order->event,
|
||||
'tickets' => $order->event->tickets,
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<div class="col-md-12 text-center">
|
||||
<h1 property="name" style="font-weight: bold">{{$event->title}}</h1>
|
||||
<p>
|
||||
Toleginiz baada maglumatlar entak gelenok. gelenson biletleri emailinize 15 minudyn dowamynda ugradarys.
|
||||
egerde toleg gechibm 15 minudyn dowamynda biletleriniz gelmedik bolsa administrasia yuz tutyn.
|
||||
Toleginiz barada maglumatlar entak gelenok. gelenson biletleri emailinize 10 minudyn dowamynda ugradarys.
|
||||
egerde bu wagt caginde biletleriniz gelmedik bolsa administrasia yuz tutmagynyzy hayys edyaris.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -59,9 +59,6 @@
|
|||
|
||||
<div class="col-6">
|
||||
<b>@lang("Public_ViewEvent.amount")</b><br> {{number_format($order->total_amount, 2)}} man.
|
||||
@if($event->organiser->charge_tax)
|
||||
<small>{{ $orderService->getVatFormattedInBrackets() }}</small>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="col-4">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile'])
|
||||
|
||||
@section('content')
|
||||
|
||||
{{-- @include('desktop.ViewEvent.Partials.HeaderSection')--}}
|
||||
{{--@include('Public.ViewEvent.Partials.EventShareSection')--}}
|
||||
<section id="intro" class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-center">
|
||||
<h1 property="name" style="font-weight: bold">{{$event->title}}</h1>
|
||||
<p>
|
||||
Toleginiz barada maglumatlar entak gelenok. gelenson biletleri emailinize 10 minudyn dowamynda ugradarys.
|
||||
egerde bu wagt caginde biletleriniz gelmedik bolsa administrasia yuz tutmagynyzy hayys edyaris.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@stop
|
||||
Loading…
Reference in New Issue