katam/konfirmasibank
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing outsanding

Browse Source
This commit is contained in:
KhatamNugraha
2024-06-07 16:33:16 +07:00
parent ad9889fb01
commit 21055c3c43
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Http/Controllers/KonfirmasiBankController.php
View File

@ -105,8 +105,11 @@ class KonfirmasiBankController extends Controller
$startDate = Carbon::parse($request->startDate);
//$dateCore = $startDate->format('m/d/Y');
$Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate)->get();
if ($Accounts->isEmpty()) {
$Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(1)->format('m/d/Y'))->get();
if($Accounts->isEmpty()){
@ -126,13 +129,19 @@ class KonfirmasiBankController extends Controller
}
foreach ($Accounts as $key => $value) {
$data[$key]['ACCOUNT_NUMBER'] = $value->ACCOUNT_NUMBER;
$data[$key]['COMPANY_NAME'] = $value->COMPANY_NAME;
$data[$key]['SHORT_NAME'] = $value->SHORT_NAME;
$data[$key]['CURRENCY'] = $value->CURRENCY;
$data[$key]['WORKING_BALANCE'] = number_format($value->WORKING_BALANCE, 2, ',', '.') ;
foreach ($Accounts as $key => $value) {
$cekProductAccount = $Account->getCekProduct($value->CUSTOMER_NO,$value->ACCOUNT_NUMBER, $value->BATCH_DATE)->first();
if (!$cekProductAccount) {
$data[$key]['ACCOUNT_NUMBER'] = $value->ACCOUNT_NUMBER;
$data[$key]['COMPANY_NAME'] = $value->COMPANY_NAME;
$data[$key]['SHORT_NAME'] = $value->SHORT_NAME;
$data[$key]['CURRENCY'] = $value->CURRENCY;
$data[$key]['WORKING_BALANCE'] = number_format($value->WORKING_BALANCE, 2, ',', '.') ;
}
}
return json_encode($data);
@ -475,7 +484,7 @@ class KonfirmasiBankController extends Controller
$DataRK[$rk]['SHORT_NAME'] = $valRk->PRODUCT_LOAN;
$DataRK[$rk]['CURRENCY'] = $valRk->LOAN_CCY;
$DataRK[$rk]['PRODUCT'] = $valRk->PRODUCT_LOAN;
$DataRK[$rk]['WORKING_BALANCE'] = $valRk->PRINCIPLE_AMOUNT != null ? number_format($valRk->PRINCIPLE_AMOUNT, 2, ',', '.') : 'NIHIL';
$DataRK[$rk]['WORKING_BALANCE'] = $valRk->OUTSTANDING != null ? number_format(abs($valRk->OUTSTANDING), 2, ',', '.') : 'NIHIL';
$DataRK[$rk]['MATURITY_DATE'] = date('d-m-Y', strtotime($valRk->MATURITY_DATE)) ?? '';
$DataRK[$rk]['ARRANGEMENT_ID'] = '';
$DataRK[$rk]['FIXED_RATE'] = $valRk->CURRENT_INTEREST_RATE;