diff --git a/app/Jobs/ExportStatementJob.php b/app/Jobs/ExportStatementJob.php index 990f8a0..fcd2215 100644 --- a/app/Jobs/ExportStatementJob.php +++ b/app/Jobs/ExportStatementJob.php @@ -168,9 +168,23 @@ : string { try { + $prefix = substr($item->trans_reference ?? '', 0, 2); + $relationMap = [ + 'FT' => 'ft', + 'TT' => 'tt', + 'DC' => 'dc', + 'AA' => 'aa' + ]; + + $datetime = '0000000000'; + if (isset($relationMap[$prefix])) { + $relation = $relationMap[$prefix]; + $datetime = $item->$relation?->date_time ?? '0000000000'; + } + return Carbon::createFromFormat( 'YmdHi', - $item->booking_date . substr($item->ft?->date_time ?? '0000000000', 6, 4) + $item->booking_date . substr($datetime, 6, 4) )->format('d/m/Y H:i'); } catch (Exception $e) { Log::warning("Error formatting transaction date: " . $e->getMessage()); @@ -182,9 +196,24 @@ : string { try { + $prefix = substr($item->trans_reference ?? '', 0, 2); + $relationMap = [ + 'FT' => 'ft', + 'TT' => 'tt', + 'DC' => 'dc', + 'AA' => 'aa' + ]; + + $datetime = '0000000000'; + if (isset($relationMap[$prefix])) { + $relation = $relationMap[$prefix]; + $datetime = $item->$relation?->date_time ?? '0000000000'; + } + + return Carbon::createFromFormat( 'ymdHi', - $item->ft?->date_time ?? '2505120000' + $datetime )->format('d/m/Y H:i'); } catch (Exception $e) { Log::warning("Error formatting actual date: " . $e->getMessage());