diff --git a/app/Http/Controllers/WebstatementController.php b/app/Http/Controllers/WebstatementController.php index af8f66d..a13de51 100644 --- a/app/Http/Controllers/WebstatementController.php +++ b/app/Http/Controllers/WebstatementController.php @@ -60,11 +60,11 @@ function listAccount(){ return [ - 'OY' => [ + 'PLUANG' => [ '1080426085', '1080425781', ], - 'PLUANG' => [ + 'OY' => [ '1081647484', '1081647485', ], diff --git a/app/Jobs/ExportStatementJob.php b/app/Jobs/ExportStatementJob.php index b1e59ff..a1e6408 100644 --- a/app/Jobs/ExportStatementJob.php +++ b/app/Jobs/ExportStatementJob.php @@ -227,6 +227,10 @@ $fmt = 'FT.IN'; } else if ($narrParam->_id == 'FTOUT') { $fmt = 'FT.OUT'; + } else if ($narrParam->_id == 'TTTRFOUT') { + $fmt = 'TT.O.TRF'; + } else if ($narrParam->_id == 'TTTRFIN') { + $fmt = 'TT.I.TRF'; } else { $fmt = $narrParam->_id; } @@ -285,7 +289,18 @@ } else { // If no value found, try to use the original field name as a fallback if ($fieldName !== 'recipt_no') { - $result .= ($item->ft?->$fieldName ?? '') . ' '; + $prefix = substr($item->trans_reference ?? '', 0, 2); + $relationMap = [ + 'FT' => 'ft', + 'TT' => 'tt', + 'DC' => 'dc', + 'AA' => 'aa' + ]; + + if (isset($relationMap[$prefix])) { + $relation = $relationMap[$prefix]; + $result .= ($item->$relation?->$fieldName ?? '') . ' '; + } } } }