From b4fe0670b20561100fb7ac00d3be43fa54add1e4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 10 Aug 2022 15:35:31 +0800 Subject: [PATCH] fix accounting export format --- .../Modules/Exports/Services/ExportsPaymentTransactions.php | 6 ++++-- .../Modules/Exports/Services/ExportsWalletTransactions.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php index 57dba200..314f54b3 100644 --- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php @@ -37,6 +37,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading 'ShipInfo', 'ItemCode', 'DetailDescription', + 'FurtherDescription', 'Qty', 'UnitPrice', 'AccNo', @@ -92,15 +93,16 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading return [ '<>', - $transaction->updated_at->format('d/m/Y'), + $transaction->updated_at->format('d/m/Y H:m'), $company->debtor, '', 'MYR', $booking->marking, '', 'PLEASE REFER TO THE ATTACHED APPENDIX REF ' . $booking->marking, + '', 1, - $transaction->amount, + round($transaction->amount, 2), '500-0000', 'CIEF' ]; diff --git a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php index 29c1728c..1b5bbeec 100644 --- a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php @@ -37,6 +37,7 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR 'ShipInfo', 'ItemCode', 'DetailDescription', + 'FurtherDescription', 'Qty', 'UnitPrice', 'AccNo', @@ -91,15 +92,16 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR return [ '<>', - $transaction->updated_at->format('d/m/Y'), + $transaction->updated_at->format('d/m/Y H:m'), $company->debtor, '', 'MYR', $transaction->bill_no, 'W1', 'CREDIT SALES', + '', 1, - $transaction->amount, + round($transaction->amount, 2), '500-0000', 'WALLET' ];