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

update array data

Browse Source
This commit is contained in:
KhatamNugraha
2023-10-03 14:02:22 +07:00
parent 6272105c91
commit 909e89a6f8
4 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Http/Controllers/KonfirmasiBankController.php
View File

@ -73,23 +73,23 @@
public function getData(Request $request)
{
$data = [];
$Account = new ViewAccount;
$arrAccount = [];
$startDate = Carbon::parse($request->startDate);
// $endtDate = Carbon::parse($request->endDate);
// $startDateCore = $startDate->subDays(2)->format("Y-m-d");
// $endDateCore = $endDate->subDays(2)->format("Y-m-d");
$dateCore = $startDate->subDays(2);
$Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $request->startDate)->get();
$Arrangement = $Account->getAAaccount($request->cif)->get();
$Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $dateCore)->get();
// $Arrangement = $Account->getAAaccount($request->cif)->get();
$maturityDate = '';
$aaID= '';
$product = '';
foreach ($Accounts as $key => $account) {
$Arrangement = $Account->getAAaccount($request->cif , $account->ACCOUNT_NUMBER)->first();
$data[$key]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
$data[$key]['INACTIV_MARKER'] = $account->INACTIV_MARKER;
@ -100,8 +100,8 @@
$data[$key]['SHORT_NAME'] = $account->SHORT_NAME;
$data[$key]['CURRENCY'] = $account->CURRENCY;
$data[$key]['OPENING_DATE'] = Carbon::parse($account->OPENING_DATE)->format('d-m-Y');
$data[$key]['MATURITY_DATE'] = $Arrangement[$key]->MATURITY_DATE ?? 'NIHIL';
$data[$key]['PRODUCT'] = $Arrangement[$key]->PRODUCT ?? 'NIHIL';
$data[$key]['MATURITY_DATE'] = $Arrangement->MATURITY_DATE ?? 'NIHIL';
$data[$key]['PRODUCT'] = $Arrangement->PRODUCT ?? 'NIHIL';
}
@ -118,15 +118,18 @@
}
$arrAccount = explode("," , $request['acc_no']);
$ViewAccount = new ViewAccount;
$data = [];
$DataAccounts = [];
$DataPinjaman = [];
$DataLimit = [];
$DataAA = [];
$listAccount = $ViewAccount->getAccount($request['cus_no'],$arrAccount,$request['kode_cabang'],$request->startDate)->get();
$listAccount = $ViewAccount->getAccount($request['cus_no'],$arrAccount,$request['kode_cabang'], $request['startDate'])->get();
$GetCustomer = $ViewAccount->getCustomer($request['cus_no'])->first();
$Arrangement = $ViewAccount->getAAaccount($request['cus_no'])->get();
// dd( $Arrangement);
$MaturityDate = '';
@ -134,23 +137,26 @@
$AAID= '';
foreach ($listAccount as $key1 => $account) {
//$Arrangement = $ViewAccount->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER);
$Arrangement = $ViewAccount->getAAaccount($request['cus_no'] , $account->ACCOUNT_NUMBER)->first();
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
$DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
$DataAccounts[$key1]['SHORT_NAME'] = $account->SHORT_NAME;
$DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
$DataAccounts[$key1]['PRODUCT'] = $product ?? '-';
$DataAccounts[$key1]['PRODUCT'] = $Arrangement->PRODUCT;
$DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
$DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE;
$DataAccounts[$key1]['MATURITY_DATE'] = (count($Arrangement) > 0) ? date('d-m-Y',strtotime($Arrangement[$key1]->MATURITY_DATE)) : 'NIHIL' ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = (count($Arrangement) > 0) ? $Arrangement[$key1]->ARRANGEMENT_ID : 'NIHIL' ;
$DataAccounts[$key1]['FIXED_RATE'] = $Arrangement[$key1]->FIXED_RATE ?? 'NIHIL';
$DataAccounts[$key1]['TERM'] = $Arrangement[$key1]->TERM ?? 'NIHIL';
$DataAccounts[$key1]['MATURITY_DATE'] = $Arrangement->MATURITY_DATE ?? 'NIHIL' ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = $Arrangement->ARRANGEMENT_ID ?? 'NIHIL';
$DataAccounts[$key1]['FIXED_RATE'] = $Arrangement->FIXED_RATE ?? 'NIHIL';
$DataAccounts[$key1]['TERM'] = $Arrangement->TERM ?? 'NIHIL';
}
$ListPinjaman =$ViewAccount->getPinjaman($request['cus_no'],$arrAccount )->get();
$ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']);
$fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get();
@ -158,7 +164,7 @@
$currentDate = Carbon::now();
$tanggalIndonesia = $currentDate->locale('id')->isoFormat('D MMMM YYYY');
$data['DataAccounts'] = $listAccount;
$data['DataAccounts'] = $DataAccounts;
$data['DataPinjaman'] = $ListPinjaman;
$data['DataLimit'] = $ListLimits;
$data['DataFasilitas'] = $fasilitas;
@ -523,4 +529,4 @@
}
}
}