diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 3abe585..cf181f7 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -343,8 +343,9 @@ foreach ($listAccount as $key1 => $account) { $dataAADepo = $Account->getAA($request['cusNo'],$account->ACCOUNT_NUMBER, $dateCore)->first(); + if ($account->CATEGORY == '6603' || $account->CATEGORY == '6602') { - if ($dataAADepo) { + if ($dataAADepo != null) { $tenor = ''; $tanggal_1 = date_create($dataAADepo->RENEWAL_DATE); $tanggal_2 = date_create($dataAADepo->START_DATE); @@ -411,11 +412,11 @@ $rateRK = substr($rateDebitRk->DR_INT_RATE, 0, -2); ; } - $DataRK[$rk]['ACCOUNT_NUMBER'] = $valRk->ACCOUNT_NUMBER; + $DataRK[$rk]['ACCOUNT_NUMBER'] = $valRk->ACCOUNT_NUMBER; $DataRK[$rk]['OPENING_DATE'] = $valRk->OPENING_DATE; $DataRK[$rk]['BATCH_DATE'] = $valRk->BATCH_DATE; $DataRK[$rk]['CUSTOMER_NO'] = $valRk->CUSTOMER_NO; - $DataRK[$rk]['SHORT_NAME'] = $valRk->SHORT_NAME; + $DataRK[$rk]['SHORT_NAME'] = 'PRK KOMERSIL'; $DataRK[$rk]['CURRENCY'] = $valRk->CURRENCY; $DataRK[$rk]['PRODUCT'] = $valRk->SHORT_TITLE; $DataRK[$rk]['WORKING_BALANCE'] = $valRk->AVAIL_AMT != null ? number_format($valRk->AVAIL_AMT, 2, ',', '.') : 'NIHIL'; @@ -451,7 +452,6 @@ $today = $currentDate->format("d-m-Y"); $letter = new Letters; $infoSuratNew = $letter->where('no_cif',$request['cusNo'])->orderBy('id','DESC')->first(); - // $infoSuratOld = $letter->where('no_cif',$request['cusNo'])->orderBy('id','ASC')->first(); $data['DataAccounts'] = $DataAccounts; $data['DataPinjaman'] = $DataPinjaman; @@ -463,7 +463,7 @@ $data['localDate'] = $tanggalIndonesia; $data['today'] = $today; $data['batchDate'] = $request['startDate2']; - // $data['infoSuratOld'] = $infoSuratOld; + $data['dataAADepo'] = $dataAADepo; $data['infoSuratNew'] = $infoSuratNew; @@ -755,4 +755,4 @@ - } \ No newline at end of file + } diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 936bc41..9f383d1 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -135,7 +135,9 @@
@if (count($data['DataAccounts'])>0 ) - @php $i=1 + @php + $i=1 + @endphp @foreach ($data['DataAccounts'] as $val)