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

fixing conf bank

Browse Source
This commit is contained in:
KhatamNugraha
2024-05-22 17:14:58 +07:00
parent 8aa10eb337
commit 2665d27dca
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Http/Controllers/KonfirmasiBankController.php
View File

@ -360,6 +360,7 @@ class KonfirmasiBankController extends Controller
$DataAnjak = [];
$GetCustomer = $Account->getCustomer($request['cusNo'])->first();
$listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore)->get();
// DD($listAccount);
// try {
foreach ($listAccount as $key1 => $account) {
@ -370,25 +371,35 @@ class KonfirmasiBankController extends Controller
if ($dataAADepo != null) {
$tenor = '';
$tanggal_1 = date_create($dataAADepo->RENEWAL_DATE);
$tglRenewal = $tanggal_1->format('d');
$tanggal_2 = date_create($dataAADepo->BASE_DATE);
$tenor = date_diff($tanggal_1, $tanggal_2);
$batchDate = $dateCore->format('Y-m-d');
$maturityDate = Carbon::createFromFormat('Y-m-d', $batchDate);
$tenorFix = $tenor->days >= 30 ? intval($tenor->days / 30) : '1';
$tenorFix = $tenor->days >= 30 ? intval($tenor->days / 30) : 1;
$startDate = $batchDate; // Tanggal mulai pinjaman
// // Konversi tanggal mulai ke objek Carbon
$tanggalMulai = Carbon::parse($startDate);
// // Hitung tanggal jatuh tempo dengan menambahkan durasi hari
$tanggalJatuhTempo = $tanggalMulai->addDays($tenor->days);
// echo $tanggalJatuhTempo->toDateString(); //
$rate = $Account->getFixedRate($dataAADepo->ARRANGEMENT_ID, $dateCore)->first();
$nextDate = $Account->getDateSchecule($dataAADepo->ARRANGEMENT_ID)->first();
//dd( $nextDate,$account->ACCOUNT_NUMBER );
$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'] = $account->SHORT_NAME;
$DataAccounts[$key1]['SHORT_NAME'] = $dataAADepo->PRODUCT_LINE == 'DEPOSITS' ? 'DEPOSITO' : $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'] = $maturityDate->addDays($tenor->days)->format('d-m-Y');
$DataAccounts[$key1]['MATURITY_DATE'] = substr($nextDate->LAST_DATE, -2) .'-'.$tanggalJatuhTempo->format('m-Y');
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = $dataAADepo->FIXED_RATE . ' %';
$DataAccounts[$key1]['FIXED_RATE'] = $rate->FIXED_RATE . ' %';
$DataAccounts[$key1]['TERM'] = $tenorFix . ' BLN';
}
@ -397,7 +408,7 @@ class KonfirmasiBankController extends Controller
$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'] = $account->SHORT_NAME;
$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;