Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

This commit is contained in:
edmondlang
2023-07-17 13:06:51 +08:00
+2 -8
View File
@@ -180,15 +180,9 @@
$rounded_voucher = (float)number_format($voucher_discount, 2,'.','');
@endphp
@if($transaction->booking()->first()->fix_currency_id !== 1)
@php
$rounded_subtotal = (float)number_format($subtotal, 2,'.','');
@endphp
{{ number_format($rounded_subtotal + $service_charge + $tax + $rounded_voucher, 2) }}
{{ number_format( ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax + $rounded_voucher, 2) }}
@else
@php
$rounded_transaction_amount = (float)number_format($transaction->amount, 2,'.','');
@endphp
{{ number_format($rounded_transaction_amount + $service_charge + $tax + $rounded_voucher, 2) }}
{{ number_format($transaction->amount + $transaction->service_charge + $transaction->tax + $rounded_voucher, 2) }}
@endif
</td>
</tr>