diff --git a/Entities/Account.php b/Entities/Account.php index 41aff76..eab0147 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -247,6 +247,24 @@ class Account extends Model return $data; } + public function getAccountAnjak($AccNo,$date){ + $timestamp = strtotime($date); + // Format the timestamp into a date format + $Year = date("Y", $timestamp); + $data = []; + $data = DB::connection("db2")->table("MIS.COLLECTION") + ->selectRaw('LOAN_NUMBER,ACCOUNT_NUMBER,MATURITY_DATE,START_DATE,MAX(TANGGAL_DATA) AS TANGGAL_DATA,MAX(OUTSTANDING) AS OUTSTANDING,LOAN_CCY,PRODUCT_LOAN,PRINCIPLE_AMOUNT,CURRENT_INTEREST_RATE,TENOR,MAX(BRANCH) AS BRANCH,PAYIN_ACCOUNT,FACILITY_TYPE') + ->whereYear('TANGGAL_DATA',$Year) + // ->whereIn('PAYIN_ACCOUNT',$AccNo) + ->whereIn(DB::raw("PAYIN_ACCOUNT"),$AccNo) + //->whereIn(DB::raw("ACCOUNT_NUMBER"),$AccNo) + ->where('LOAN_STATUS','CURRENT') + ->groupBy('LOAN_NUMBER','ACCOUNT_NUMBER','MATURITY_DATE','START_DATE','LOAN_CCY','PRODUCT_LOAN','PRINCIPLE_AMOUNT','CURRENT_INTEREST_RATE','TENOR','PAYIN_ACCOUNT','FACILITY_TYPE') + + ->limit(100); + return $data; + } + public function getLimit($cus_id,$periode){ $timestamp = strtotime($periode); // Format the timestamp into a date format @@ -269,4 +287,4 @@ class Account extends Model -} +} \ No newline at end of file diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 95e8828..3139fd9 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -376,15 +376,17 @@ $DataPinjaman = []; $DataFasilitas = []; $DataRK = []; - $Accounts = []; + $rekEscrow = []; + $DataAnjak = []; // dd($listAccount); $GetCustomer = $Account->getCustomer($request['cusNo'])->first(); + //dd($GetCustomer ); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get(); //dd( $listAccount); foreach ($listAccount as $key1 => $account) { $dataAADepo = $Account->getAA($request['cusNo'],$account->ACCOUNT_NUMBER, $dateCore)->first(); - array_push($Accounts, $account->ACCOUNT_NUMBER); + // $AccountAnjak = $Account->getAccountAnjak($request['cusNo'], $dateCore )->first(); @@ -410,7 +412,7 @@ } }else{ - $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $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; @@ -425,13 +427,18 @@ $DataAccounts[$key1]['TERM'] = ''; } + //get data anjak + + if ($account->CATEGORY == '1019') { + array_push($rekEscrow, $account->ACCOUNT_NUMBER); + + } + + } - // $string = implode(", ", $Accounts); - // dd($string ); - // $DataAnjak = $Account->getAccountAnjak($Accounts, $dateCore)->get(); - // dd($DataAnjak ); + $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get(); foreach ($Arrangement as $key2 => $pinjaman) { @@ -452,7 +459,6 @@ $listAccountRK = $Account->getAccountRK($request['cusNo'], $dateCore )->get(); - foreach ($listAccountRK as $rk => $valRk) { if ( $valRk->CATEGORY == '1003') { $rateRK = ""; @@ -494,6 +500,21 @@ $DataFasilitas[$key3]['nomor_rekening'] = $val3->nomor_rekening; } + //Get DatA Anjak + $ListAnjak = $Account->getAccountAnjak($rekEscrow, $dateCore)->get(); + + foreach ($ListAnjak as $key4 => $val4) { + $DataAnjak[$key4]['PRODUCT_LOAN'] = $val4->PRODUCT_LOAN; + $DataAnjak[$key4]['LOAN_CCY'] = $val4->LOAN_CCY; + $DataAnjak[$key4]['CUSTOMER_NO'] = $val4->PAYIN_ACCOUNT; + $DataAnjak[$key4]['TENOR'] = $val4->TENOR; + $DataAnjak[$key4]['OUTSTANDING'] = $val4->OUTSTANDING != null ? number_format($val4->OUTSTANDING, 2, ',', '.') : 'NIHIL'; + $DataAnjak[$key4]['MATURITY_DATE'] = date('d-m-Y', strtotime($val4->MATURITY_DATE)) ?? ''; ; + $DataAnjak[$key4]['ACCOUNT_NUMBER'] = $val4->ACCOUNT_NUMBER; + $DataAnjak[$key4]['CURRENT_INTEREST_RATE'] = $val4->CURRENT_INTEREST_RATE; + $DataAnjak[$key4]['TERM'] = $val4->CURRENT_INTEREST_RATE; + } + $ListLimits = $Account->getLimit($request['cusNo'],$request['startDate2'])->get(); // dd($fasilitas); @@ -517,6 +538,7 @@ // $data['batchDate'] = $request['startDate2']; $data['dataAADepo'] = $dataAADepo; $data['infoSuratNew'] = $infoSuratNew; + $data['DataAnjak'] = $DataAnjak; // dd($data); diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 8c862c5..8991aa0 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -198,7 +198,7 @@ - @if (count($data['DataPinjaman'])>0 OR count($data['DataRK'])>0) + @if (count($data['DataPinjaman'])>0 OR count($data['DataRK'])>0 OR count($data['DataAnjak']) > 0 ) @if (count($data['DataPinjaman'])>0) @php $i=1; $saldo = ''; @@ -230,7 +230,7 @@ @foreach ($data['DataRK'] as $rk => $dtRK) - {{ $i++ }} + {{ $no++ }} {{ $dtRK['SHORT_NAME'] }} {{ $dtRK['CURRENCY'] }} @@ -242,6 +242,34 @@ @endforeach @endif + + @if (count($data['DataAnjak']) > 0) + @php + $no = 0; + if (count( $data['DataPinjaman']) > 0) { + $no = count($data['DataPinjaman']) + 1 ; + }else if(count( $data['DataRK']) > 0){ + $no = count($data['DataRK']) + 1 ; + }else{ + $no = 1; + } + @endphp + + @foreach ($data['DataAnjak'] as $ajk => $anjak) + + {{ $no++ }} + {{ $anjak['PRODUCT_LOAN'] }} + + {{ $anjak['LOAN_CCY'] }} + {{$anjak['OUTSTANDING']}} + {{$anjak['TENOR']}} BLN + {{$anjak['CURRENT_INTEREST_RATE']}} % + {{$anjak['MATURITY_DATE']}} + {{ $anjak['ACCOUNT_NUMBER'] }} + + @endforeach + + @endif @else NIHIL