From b0fb5e4ac91b1d7a6e3754c4ce7839b01aa49d45 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 31 Jul 2025 23:56:37 +0800 Subject: [PATCH] E-Invoice - Automapping Issues, AR Credit Note Report (Export) --- .../Exports/Services/ExportsARCreditNoteReport.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php index 240c9d9e..2b7d41b9 100644 --- a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php +++ b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php @@ -74,6 +74,7 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR $booking = null; $autoCountSalesInvoiceId = null; $formattedDocumentDate = null; + $refundRemark = null; $company = $transaction->owner->owner; $kvps = KeyValuePair::where('value', $transaction->id) @@ -83,7 +84,9 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR foreach ($kvps as $kvp) { if ($kvp && $kvp->owner && $kvp->owner->owner && $kvp->owner->owner->type === 1) { - $booking = $kvp->owner->owner->booking; + $refundTransaction = $kvp->owner; + $refundRemark = $refundTransaction->remarks && $refundTransaction->remarks->first() ? $refundTransaction->remarks->first()->content : null; + $booking = $refundTransaction->owner->booking; if($booking){ $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO)->first(); if($metadata){ @@ -109,8 +112,8 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR $formattedDocumentDate, //DocDate $company->debtor, //DebtorCode $booking ? $booking->marking : '', //Ref - $transaction->payment_reference, //Description - $transaction->payment_reference, //Reason + $refundRemark ?? '', //Description + $refundRemark ?? '', //Reason 'C', //DeptNo '1', //Qty number_format($transaction->amount, 2), //UnitPrice