diff --git a/Entities/VwDeposito.php b/Entities/VwDeposito.php new file mode 100644 index 0000000..b3dabc7 --- /dev/null +++ b/Entities/VwDeposito.php @@ -0,0 +1,38 @@ +where('nama_cabang','like', '%'.$cabang.'%') ->get(); + $Depos =Loan::whereIn('no_rek',$arrAccount) + ->whereDate('periode',$startDateLoan ) + //->where('kode_status_lunas', '<>', 'EXPIRED') + ->where('nama_cabang','like', '%'.$cabang.'%') + ->get(); + @@ -570,8 +577,8 @@ class KonfirmasiBankController extends Controller $listAccount = DPK::where('cif',$request['cusNo']) ->whereIn('no_rek', $arrAccount) ->whereDate('period', $dateCoreAccount ) - ->where('nama_cabang','like', '%'.$cabang.'%') - ->orderBy('jenis_rekening', 'DESC') + // ->where('nama_cabang','like', '%'.$cabang.'%') + ->orderBy('jatuh_tempo', 'DESC') ->get(); } } @@ -579,6 +586,15 @@ class KonfirmasiBankController extends Controller } } + //listdeposito + $listDepo = Vwdeposito::where('cif',$request['cusNo']) + ->whereDate('period', $dateCoreAccount ) + ->where('nama_cabang','like', '%'.$cabang.'%') + ->orderBy('jenis_rekening', 'DESC') + ->get(); + + // dd($listDepo); + // try { @@ -599,25 +615,41 @@ class KonfirmasiBankController extends Controller $DataAccounts[$key1]['TERM'] = ''; } - if ($account->jenis_rekening == 'DEPOSITO') { - $tanggalMulai = Carbon::parse($account->tgl_mulai); - $tanggalJatuhTempo = Carbon::parse($account->jatuh_tempo); - $selisihHari = $tanggalMulai->diffInMonths($tanggalJatuhTempo); - $DataDepo[$key1]['ACCOUNT_NUMBER'] = $account->no_rek; - $DataDepo[$key1]['BATCH_DATE'] = $account->period; - $DataDepo[$key1]['CUSTOMER_NO'] = $account->cif; - $DataDepo[$key1]['SHORT_NAME'] = $account->jenis_rekening; //$depo->SHORT_NAME; - $DataDepo[$key1]['CURRENCY'] = $account->kode_mata_uang; - $DataDepo[$key1]['PRODUCT'] = $account->jenis_rekening; - $DataDepo[$key1]['COMPANY_NAME'] = $account->nama_cabang; - $DataDepo[$key1]['WORKING_BALANCE'] = $account->jumlah_nominal != null ? number_format(abs($account->jumlah_nominal), 2, ',', '.') : 'NIHIL'; - $DataDepo[$key1]['MATURITY_DATE'] = Carbon::parse($account->jatuh_tempo)->format('d-m-Y'); - $DataDepo[$key1]['FIXED_RATE'] = $account->suku_bunga . ' %' ; - $DataDepo[$key1]['TERM'] = $selisihHari . ' BLN'; - } + // if ($account->jenis_rekening == 'DEPOSITO') { + // $tanggalMulai = Carbon::parse($account->tgl_mulai); + // $tanggalJatuhTempo = Carbon::parse($account->jatuh_tempo); + // $selisihHari = $tanggalMulai->diffInMonths($tanggalJatuhTempo); + // $DataDepo[$key1]['ACCOUNT_NUMBER'] = $account->no_rek; + // $DataDepo[$key1]['BATCH_DATE'] = $account->period; + // $DataDepo[$key1]['CUSTOMER_NO'] = $account->cif; + // $DataDepo[$key1]['SHORT_NAME'] = $account->jenis_rekening; //$depo->SHORT_NAME; + // $DataDepo[$key1]['CURRENCY'] = $account->kode_mata_uang; + // $DataDepo[$key1]['PRODUCT'] = $account->jenis_rekening; + // $DataDepo[$key1]['COMPANY_NAME'] = $account->nama_cabang; + // $DataDepo[$key1]['WORKING_BALANCE'] = $account->jumlah_nominal != null ? number_format(abs($account->jumlah_nominal), 2, ',', '.') : 'NIHIL'; + // $DataDepo[$key1]['MATURITY_DATE'] = Carbon::parse($account->jatuh_tempo)->format('d-m-Y'); + // $DataDepo[$key1]['FIXED_RATE'] = $account->suku_bunga . ' %' ; + // $DataDepo[$key1]['TERM'] = $selisihHari . ' BLN'; + // } } + foreach ($listDepo as $key2 => $depo) { + $DataDepo[$key2]['ACCOUNT_NUMBER'] = $depo->no_rek; + $DataDepo[$key2]['BATCH_DATE'] = $depo->period; + $DataDepo[$key2]['CUSTOMER_NO'] = $depo->cif; + $DataDepo[$key2]['SHORT_NAME'] = $depo->jenis_rekening; //$depo->SHORT_NAME; + $DataDepo[$key2]['CURRENCY'] = $depo->kode_mata_uang; + $DataDepo[$key2]['PRODUCT'] = $depo->jenis_rekening; + $DataDepo[$key2]['COMPANY_NAME'] = $depo->nama_cabang; + $DataDepo[$key2]['WORKING_BALANCE'] = $depo->jumlah_nominal != null ? number_format(abs($depo->jumlah_nominal), 2, ',', '.') : 'NIHIL'; + $DataDepo[$key2]['MATURITY_DATE'] = Carbon::parse($depo->jatuh_tempo)->format('d-m-Y'); + $DataDepo[$key2]['FIXED_RATE'] = $depo->suku_bunga . ' %' ; + $DataDepo[$key2]['TERM'] = $depo->tenor; + } + + + $DataLoan = []; foreach ($Loans as $keyLon => $lon) { if ($lon->kode_status_lunas != 'EXPIRED') { @@ -654,8 +686,6 @@ class KonfirmasiBankController extends Controller $letter = new Letters(); $infoSuratNew = $letter->where('no_cif', $request['cusNo'])->orderBy('id', 'DESC')->first(); - - $data['DataAccounts'] = $DataAccounts ?? ''; $data['DataLoan'] = $DataLoan ?? ''; $data['DataDepo'] = $DataDepo ?? ''; diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 0a40a0c..6c024c4 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -172,10 +172,16 @@ @endforeach + @else + + NIHIL + + @endif - @if (count($data['DataDepo']) > 0) + + @if (count($data['DataDepo']) > 0) @php - $no= count($data['DataAccounts']); + $no= count($data['DataAccounts']) +1; @endphp @foreach ($data['DataDepo'] as $item) @@ -209,11 +215,7 @@ @endif - @else - - NIHIL - - @endif +