diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php index 50f57c55..0ca1d730 100644 --- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php @@ -32,20 +32,14 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading 'DocNo', 'DocDate', 'DebtorCode', - 'Ref', - 'Note', + 'DebtorName', + 'CurrencyCode', 'ShipInfo', - 'Numbering', - 'AccNo', + 'ItemCode', 'DetailDescription', - 'FutherDEscription', - 'YourPONo', - 'YourPODate', - 'ProjNo', - 'UOM', 'Qty', 'UnitPrice', - 'SubTotal' + 'AccNo' ]; } @@ -96,23 +90,17 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading $company = $booking->company()->first(); return [ - '<>', + '<>', $transaction->updated_at->format('d/m/Y'), - $company->debtor, - '', - '', - $booking->marking, - '', - '500-0000', + $company->debtor, + '', + 'MYR', + $booking->marking, + '', 'PLEASE REFER TO THE ATTACHED APPENDIX REF ' . $booking->marking, - '', - '', - '', - '', - '', - 1, + 1, $transaction->amount, - $transaction->amount, + '500-0000' ]; } } \ No newline at end of file diff --git a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php index a989b8d1..5e613877 100644 --- a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php @@ -32,20 +32,14 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR 'DocNo', 'DocDate', 'DebtorCode', - 'Ref', - 'Note', + 'DebtorName', + 'CurrencyCode', 'ShipInfo', - 'Numbering', - 'AccNo', + 'ItemCode', 'DetailDescription', - 'FutherDEscription', - 'YourPONo', - 'YourPODate', - 'ProjNo', - 'UOM', 'Qty', 'UnitPrice', - 'SubTotal' + 'AccNo' ]; } @@ -95,23 +89,17 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR $company = $transaction->owner->owner; return [ - '<>', + '<>', $transaction->updated_at->format('d/m/Y'), - $company->debtor, - '', + $company->debtor, '', - $transaction->bill_no, - '', - '500-0000', + 'MYR', + $transaction->reference, + 'W1', 'CREDIT SALES', - '', - '', - '', - '', - '', - 1, + 1, $transaction->amount, - $transaction->amount, + '500-0000' ]; } } \ No newline at end of file