diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php index da42d25f..75953f2b 100644 --- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php +++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php @@ -40,12 +40,12 @@ class ImportStatementInvoiceController if (str_starts_with($row['shipping_info'], 'TOPUP')) { // find in exchange first, if cannont then find in izyim foreach (['exchange','izyim'] as $system) { - $returnReference = $this->mappingTopUp($row, $system); + [$returnReference, $transactionDate] = $this->mappingTopUp($row, $system); if ($returnReference) { // $row['mapped_result_reference'] = $data['owner_reference']; // $row['payment_received_date'] = date('Y-m-d', strtotime($data['created_at'])); $row['mapped_result_reference'] = $returnReference; - $row['payment_received_date'] = ''; + $row['payment_received_date'] = $transactionDate ? date('d-m-Y', strtotime($transactionDate)) : null; $row['mapped_status'] = 'success'; return $row; } @@ -150,7 +150,7 @@ class ImportStatementInvoiceController try { if ($data = (App()->make(ChecksBillNumber::class))->execute($row['shipping_info'], $system)) { // if ($system == 'izyim' && isset($data['owner_reference'])) return $data; - if ($system == 'izyim' && isset($data['owner_reference'])) return $data['owner_reference']; + if ($system == 'izyim' && isset($data['owner_reference'])) return [$data['owner_reference'], null]; if ($system == 'exchange') return $this->updateTransactionOwnerReference($data, $row['doc_no']); }