diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index b7f0e5ad..b12c1ef9 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -80,9 +80,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho $transactionTypes[$transaction->type], $transaction->issuerCompany->name, $transaction->reciver, - $transaction->currency_id === 1 ? 'MYR' : 'RMB', + $transaction->currency->short_code, $transaction->amount, - $transaction->original_currency_id === 1 ? 'MYR' : 'RMB', + $transaction->original_currency->short_code, $transaction->original_amount, $transaction->currency_rate, $transaction->tax, @@ -93,4 +93,4 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho $marking ]; } -} \ No newline at end of file +} diff --git a/resources/views/pages/pdfs/currency_vendor_order.blade.php b/resources/views/pages/pdfs/currency_vendor_order.blade.php index 3f37cc08..1c92e205 100644 --- a/resources/views/pages/pdfs/currency_vendor_order.blade.php +++ b/resources/views/pages/pdfs/currency_vendor_order.blade.php @@ -54,21 +54,21 @@ @php $sub_total_booking_amount = number_format((float)$transactions->sum('original_amount'), 2, '.', ''); @endphp - RMB {{$sub_total_booking_amount}} + {{$transaction->original_currency->short_code}} {{$sub_total_booking_amount}} Transfer fee: @php $transfer_fee = number_format((float)$transferFeeTransactions->sum('service_charge'), 2, '.', ''); @endphp - RMB {{$transfer_fee}} + {{$transaction->original_currency->short_code}} {{$transfer_fee}} Total booking amount: @php $total_booking_amount = number_format((float) ($transactions->sum('original_amount') + $transfer_fee), 2, '.', ''); @endphp - RMB {{$total_booking_amount}} + {{$transaction->original_currency->short_code}} {{$total_booking_amount}} Sub total amount: @@ -100,4 +100,4 @@ -@endsection \ No newline at end of file +@endsection