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