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

payment mobile fix last

This commit is contained in:
merdan 2020-02-01 18:51:21 +05:00
parent e5380b7941
commit fbcd4c25fb
2 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -936,9 +936,9 @@ class EventCheckoutController extends Controller
try {
$order = Order::select('orders.id','order_status_id','is_payment_received','amount','booking_fee',
'organiser_booking_fee','event_id','session_id','account_id')
->with(['event:id,sales_volume,organiser_fees_volume,organiser_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('transaction_id',$transaction_id)
->where('event_id',$event_id)
->first();

45
resources/views/Bilettm/Mobile/CheckoutSuccess.blade.php
View File

@ -75,7 +75,7 @@
</div>
<div class="col-4">
<b>@lang("Public_ViewEvent.amount")</b><br> {{$order->event->currency_symbol}}{{number_format($order->total_amount, 2)}}
<b>@lang("Public_ViewEvent.amount")</b><br> {{number_format($order->total_amount, 2)}} man.
@if($event->organiser->charge_tax)
<small>{{ $orderService->getVatFormattedInBrackets() }}</small>
@endif
@ -96,19 +96,6 @@
</div>
@if(!$order->is_payment_received)
<h3>
@lang("Public_ViewEvent.payment_instructions")
</h3>
<div class="alert alert-info">
@lang("Public_ViewEvent.order_awaiting_payment")
</div>
<div class="offline_payment_instructions well">
{!! Markdown::parse($event->offline_payment_instructions) !!}
</div>
@endif
<h3 class="mt-4">
@lang("Public_ViewEvent.order_items")
</h3>
@ -200,36 +187,6 @@
{{ $orderService->getGrandTotal(true) }}
</td>
</tr>
@if($order->is_refunded || $order->is_partially_refunded)
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
<b>@lang("Public_ViewEvent.refunded_amount")</b>
</td>
<td colspan="2">
{{money($order->amount_refunded, $order->event->currency)}}
</td>
</tr>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
<b>@lang("Public_ViewEvent.total")</b>
</td>
<td colspan="2">
{{money($order->total_amount - $order->amount_refunded, $order->event->currency)}}
</td>
</tr>
@endif
</tbody>
</table>