diff --git a/app/Jobs/ExportStatementJob.php b/app/Jobs/ExportStatementJob.php index 013d800..9601616 100644 --- a/app/Jobs/ExportStatementJob.php +++ b/app/Jobs/ExportStatementJob.php @@ -197,26 +197,27 @@ */ private function generateNarrative($item) { - $narr = ''; + $narr = []; - // Check if transaction exists before accessing its properties if ($item->transaction) { - if ($item->transaction->narr_type) { - $narr .= $item->transaction->stmt_narr . ' '; - $narr .= $this->getFormatNarrative($item->transaction->narr_type, $item); - } else { - $narr .= $item->transaction->stmt_narr . ' '; + if ($item->transaction->stmt_narr) { + $narr[] = $item->transaction->stmt_narr; } - } else { - // Fallback description if transaction is null - $narr .= ''; + if ($item->narrativ) { + $narr[] = $item->narrativ; + } + if ($item->transaction->narr_type) { + $narr[] = $this->getFormatNarrative($item->transaction->narr_type, $item); + } + } else if ($item->narrativ) { + $narr[] = $item->narrativ; } if ($item->ft?->recipt_no) { - $narr .= 'Receipt No: ' . $item->ft->recipt_no; + $narr[] = 'Receipt No: ' . $item->ft->recipt_no; } - return trim($narr); + return implode(' ', array_filter($narr)); } /**