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

fixing query konbank

Browse Source
This commit is contained in:
KhatamNugraha
2024-06-05 14:27:41 +07:00
parent da5874de41
commit 79b115bcb6
3 changed files with 122 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Http/Controllers/KonfirmasiBankController.php
View File

@ -408,41 +408,19 @@ class KonfirmasiBankController extends Controller
foreach ($listAccount as $key1 => $account) {
if ($account->CATEGORY == '6603' || $account->CATEGORY == '6602') {
$dataAADepo = $Account->getArr($request['cusNo'], $account->ACCOUNT_NUMBER, $dateCore)->first();
// dd($days);
if ($dataAADepo != null) {
$dataAADepo = $Account->getArr($account->CUSTOMER_NO, $account->ACCOUNT_NUMBER, $dateCore)->first();
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $dataAADepo->NOMOR_REKENING;
$DataAccounts[$key1]['OPENING_DATE'] = $dataAADepo->TANGGAL_BUKA_REKENING;
$DataAccounts[$key1]['BATCH_DATE'] = $dataAADepo->BATCH_DATE;
$DataAccounts[$key1]['CUSTOMER_NO'] = $dataAADepo->NOMOR_CIF;
$DataAccounts[$key1]['SHORT_NAME'] = 'DEPOSITO';
$DataAccounts[$key1]['CURRENCY'] = $dataAADepo->MATA_UANG;
// $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
$DataAccounts[$key1]['COMPANY_NAME'] = $dataAADepo->CABANG;
$DataAccounts[$key1]['WORKING_BALANCE'] = number_format($dataAADepo->SALDO_REKENING, 2, ',', '.') ;
$DataAccounts[$key1]['MATURITY_DATE'] = Carbon::parse($dataAADepo->MATURITY_DATE)->format('d-m-Y');
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = $dataAADepo->SUKU_BUNGA. ' %';
$DataAccounts[$key1]['TERM'] = substr($dataAADepo->TENOR, 0, -1) . ' BLN';
}
}else{
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
$DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
$DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
$DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
$DataAccounts[$key1]['SHORT_NAME'] = 'GIRO'; //$account->SHORT_NAME;
$DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
$DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
$DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
$DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
$DataAccounts[$key1]['MATURITY_DATE'] = '' ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = '';
$DataAccounts[$key1]['TERM'] = '';
}
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
$DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
$DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
$DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
$DataAccounts[$key1]['SHORT_NAME'] = 'GIRO'; //$account->SHORT_NAME;
$DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
$DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
$DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
$DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
$DataAccounts[$key1]['MATURITY_DATE'] = '' ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = '';
$DataAccounts[$key1]['TERM'] = '';
//get data anjak
if ($account->CATEGORY == '1019') {
@ -453,6 +431,21 @@ class KonfirmasiBankController extends Controller
}
$DataDepo = [];
$Deposito = $Account->getDepo($request['cusNo'], $arrAccount, $dateCore)->get();
foreach ($Deposito as $keyDep => $depo) {
$DataDepo[$keyDep]['ACCOUNT_NUMBER'] = $depo->NO_REK;
$DataDepo[$keyDep]['BATCH_DATE'] = $depo->PERIOD;
$DataDepo[$keyDep]['SHORT_NAME'] = 'DEPOSITO';
$DataDepo[$keyDep]['CURRENCY'] = $depo->KODE_MATA_UANG;
$DataDepo[$keyDep]['WORKING_BALANCE'] = number_format($depo->JUMLAH_NOMINAL, 2, ',', '.') ;
$DataDepo[$keyDep]['MATURITY_DATE'] = Carbon::parse($depo->JATUH_TEMPO)->format('d-m-Y');
$DataDepo[$keyDep]['ARRANGEMENT_ID'] = '';
$DataDepo[$keyDep]['FIXED_RATE'] = $depo->SUKU_BUNGA;
$DataDepo[$keyDep]['TERM'] = substr($depo->KODE_SUB_PRODUK, 0, -1);
}
$Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get();
@ -542,7 +535,7 @@ class KonfirmasiBankController extends Controller
$data['DataCustomer'] = $GetCustomer ?? '';
$data['localDate'] = $tanggalIndonesia;
$data['today'] = $today;
$data['dataAADepo'] = $dataAADepo;
$data['DataDepo'] = $DataDepo;
$data['infoSuratNew'] = $infoSuratNew;
$data['totalOutstanding'] = $totalOutstanding;
@ -833,4 +826,4 @@ class KonfirmasiBankController extends Controller
}
}
}