cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-28 17:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
Dillon
2023-07-28 11:01:40 +08:00
parent 1fc09d693e 2f2f70c210
commit 503b290075
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
+2 -1
View File
@@ -21,7 +21,8 @@ class ListShippingPortalTransactions
return $data['payload']['data'];
} catch (\Exception $exception) {
dd($exception->getMessage());
// dd($exception->getMessage());
throw new MalformedRequestException($exception->getMessage());
// preg_match('/\{.*\}/s', $exception->getMessage(), $matches);
// $jsonError = json_decode($matches[0]);
// Retrieved Transactions failed
app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+37 -25
View File
@@ -55,11 +55,9 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
*/
public function query()
{
$query = StatementTransactionOwner::whereNull('invoice_reference')
return StatementTransactionOwner::whereNull('invoice_reference')
->whereIn('type', [StatementTransactionOwnerType::SALES, StatementTransactionOwnerType::WALLET_TOP_UP])
->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED]);
return $query;
}
/**
@@ -69,20 +67,21 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
*/
public function map($transaction): array
{
$row = null;
$logArray = [];
$logArray['counter'] = $this->counter;
$logArray = [
'counter' => $this->counter,
'system' => $transaction->system,
'StatementTransactionOwner_id' => $transaction->id,
'transaction_table_id' => $transaction->owner_id,
];
$this->counter += 1;
$logArray['system'] = $transaction->system;
$logArray['StatementTransactionOwner_id'] = $transaction->id;
$logArray = json_encode($logArray);
$filePath = storage_path('logs/exports_invoice_transactions.log');
$filePath = storage_path('logs/exports_invoice_transactions.log');
$errorFilePath = storage_path('logs/exports_invoice_transactions_error.log');
$textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $logArray . PHP_EOL;
file_put_contents($filePath, $textToAppend, FILE_APPEND);
if($transaction->system == 'EXCHANGE') {
if ($transaction->system == 'EXCHANGE') {
$row = (App()->make($transaction->owner_type))->where('id', $transaction->owner_id)->first();
$company = $row->type === TransactionType::PAYMENT ? $row->owner->company : $row->owner->owner;
@@ -104,30 +103,43 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
'500-0000',
'CIEF'
];
}
else {
} else {
$row = (App()->make(ListShippingPortalTransactions::class))->execute([
'id' => $transaction->owner_id,
'with_company' => true,
])[0];
'id' => $transaction->owner_id,
'with_company' => true,
]);
if (empty($row) || $row[0]['status'] != 'success') {
$textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Fetch Shipping Transaction Fail ' . json_encode([
'id' => $transaction->owner_id,
'with_company' => true,
]) . PHP_EOL;
file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
$textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
return [];
}
$row = $row[0];
return [
'<<New>>',
'<<New>>',
$row['updated_at'],
$row['debtor_code'],
$row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['marking'],
'',
'MYR',
'MYR',
$row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['bill_no'],
$row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
$row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
$row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
$row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
'',
1,
round($row['amount'], 2),
'500-0000',
1,
round($row['amount'], 2),
'500-0000',
'CIEF'
];
];
}
}
}
}