diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 3eb2522..405c4d7 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -99,7 +99,8 @@ class ViewAccount extends Model $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR") ->select('*') ->where('CUSTOMER',$cus_no) - ->where('CATEGORY' , 3); + ->where('CATEGORY' , 3) + ->orderBy('TERM','DESC'); // ->where('BATCH_DATE', $dateCore); return $data; @@ -151,7 +152,7 @@ class ViewAccount extends Model ->join('STG_DB.LIMIT_REFERENCE AS LR', 'LM.LIMIT_PRODUCT', '=', 'LR.ID') ->join('STG_DB.COMPANY AS CP', 'LM.CO_CODE', '=', 'CP.ID') ->join('STG_DB.CATEGORY AS CT', 'LM.LIMIT_PRODUCT', '=', 'CT.ID') - ->select('LM.LIMIT_CURRENCY','LM.APPROVAL_DATE','LM.EXPIRY_DATE','LM.AVAIL_AMT','LM.BATCH_DATE','LM.EXPIRY_DATE','LR.SHORT_NAME','LR.LIMIT_PERCENTAGE','CP.COMPANY_NAME','CT.SHORT_NAME AS ACCOUNT_TYPE') + ->select('LM.ACCOUNT','LM.LIMIT_CURRENCY','LM.APPROVAL_DATE','LM.EXPIRY_DATE','LM.AVAIL_AMT','LM.BATCH_DATE','LM.EXPIRY_DATE','LR.SHORT_NAME','LR.LIMIT_PERCENTAGE','CP.COMPANY_NAME','CT.SHORT_NAME AS ACCOUNT_TYPE') ->where('LM.@ID', 'like',"%".$cus_id."%") ->where('LM.BATCH_DATE', 'like',"%".$periode."%") ->orderBy('LM.@ID','DESC')->get(); diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index cb45066..cc25376 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -169,22 +169,40 @@ foreach ($listAccount as $key1 => $account) { //$Arrangement = $ViewAccount->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER); $Arrangement = $ViewAccount->getAAaccount($request['cus_no'] , $account->ACCOUNT_NUMBER)->first(); + $months = ''; + // dd($Arrangement); + if($Arrangement != null){ + + $arrTerm = substr($Arrangement->TERM,-1); + if($arrTerm[1] = 'Y'){ + $monthsInYear = 12; + $months = int($arrTerm[0]) * $monthsInYear; + // $term = $days; + }elseif ($arrTerm[1] = 'D') { + $averageDaysInMonth = 30.44; + $months = int($arrTerm[0]) / $averageDaysInMonth; + // return $days; + } + } + $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]['CURRENCY'] = $account->CURRENCY; - $DataAccounts[$key1]['PRODUCT'] = $Arrangement->PRODUCT ?? 'NIHIL'; + $DataAccounts[$key1]['PRODUCT'] = $Arrangement->PRODUCT ?? ''; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE; - $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'; + $DataAccounts[$key1]['MATURITY_DATE'] = $Arrangement->MATURITY_DATE ?? '' ; + $DataAccounts[$key1]['ARRANGEMENT_ID'] = $Arrangement->ARRANGEMENT_ID ?? ''; + $DataAccounts[$key1]['FIXED_RATE'] = $Arrangement->FIXED_RATE ?? ''; + $DataAccounts[$key1]['TERM'] = $months ?? ''; } + $ListPinjaman =$ViewAccount->getPinjaman($request['cus_no'],$arrAccount , $dateCore )->get(); $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']); @@ -827,4 +845,4 @@ } - } + } \ No newline at end of file diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 90fa5f3..e60ff4b 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -86,7 +86,7 @@



@@ -117,22 +117,43 @@ {{-- --}} - + @if (count($data['DataAccounts'])>0) - @php $i=1 @endphp + @php $i=1 + @endphp @foreach ($data['DataAccounts'] as $val) + + @php + + $months =""; + if ($val['TERM'] != '') { + $arrData = substr($val['TERM'],-1); + if($arrData = 'Y'){ + $monthsInYear = 12; + $months = intval(substr($val['TERM'], 0, -1)) * $monthsInYear; + // $term = $days; + }elseif ($arrData = 'D') { + $averageDaysInMonth = 30.44; + $months = intval(substr($val['TERM'], 0, -1)) / $averageDaysInMonth; + // return $days; + }else{ + $months = intval($val['TERM']); + } + } + @endphp + {{-- --}} - - - - + + + + {{-- --}} @@ -149,7 +170,7 @@
Suku BungaTgl RealisasiTgl Jatuh TempoKetKeterangan
{{ $i++ }} {{ $val['SHORT_NAME'] }} {{ $val['OPENING_DATE'] }}{{ $val['SHORT_NAME'] }}{{ $val['CURRENCY'] }}{{ $val['WORKING_BALANCE'] }}{{ $val['TERM'] }} {{ $val['FIXED_RATE'] }}{{ $val['CURRENCY'] }}{{ ($val['WORKING_BALANCE'] != 0.00) ? number_format($val['WORKING_BALANCE'],2,',','.') : 'NIHIL'}} {{ round(intval($months)) ? 0 : '' }} {{ intval($val['FIXED_RATE']) / 100 }} %{{ $val['OPENING_DATE'] }}{{ $val['MATURITY_DATE'] }} {{ $val['ACCOUNT_NUMBER'] }}

@@ -164,23 +185,30 @@ {{-- --}} - + @if (count($data['DataPinjaman'])>0) - @php $i=1 + @php $i=1; + $saldo = ''; @endphp - @foreach ($data['DataPinjaman'] as $pinjaman) + @foreach ($data['DataPinjaman'] as $key1 => $pinjaman) - - {{-- --}} - - - - + + {{-- --}} + + + @if (substr($pinjaman->TERM,-1) == 'D') + + @elseif(substr($pinjaman->TERM,-1) == 'Y') + + @else + + @endif + {{-- --}} @@ -194,21 +222,24 @@
Suku BungaTgl RealisasiTgl Jatuh TempoKetKeterangan
{{ $i++ }} {{ $pinjaman->CATEGORY_NAME }}{{ $pinjaman->START_DATE }}{{ $pinjaman->CATEGORY_NAME }}{{ $pinjaman->CURRENCY }}{{ $pinjaman->WORKING_BALANCE }}{{ $pinjaman->TERM }}{{ $pinjaman->FIXED_RATE }}{{$pinjaman->START_DATE }}{{ $pinjaman[$key1]->CATEGORY_NAME }}{{ $pinjaman->CURRENCY }} {{ ($pinjaman->WORKING_BALANCE != 0.00) ? number_format($pinjaman->WORKING_BALANCE,2,',','.') : 'NIHIL'}}{{ round(intval(substr($pinjaman->TERM, 0, -1)) / 30) }} {{ round(intval(substr($pinjaman->TERM, 0, -1)) * 12) }} {{ $pinjaman->TERM }}{{ intval($pinjaman->FIXED_RATE) / 100 }} %{{ $pinjaman->START_DATE }}{{ $pinjaman->MATURITY_DATE }} {{ $pinjaman->ACCOUNT_NUMBER }}

- {{--

FASILITAS LAIN YANG DITERIMA OLEH NASABAH

-

POSISI {{ strtoupper($data['localDate']) }}

+ - - - - - - - - - - + + + + {{-- --}} + + + + + {{-- --}} + + @@ -218,19 +249,34 @@ @php $approvalDate = \Carbon\Carbon::parse($limit->APPROVAL_DATE); $expiryDate = \Carbon\Carbon::parse($limit->EXPIRY_DATE); - $term = $expiryDate->diffInDays($approvalDate); + $term = $expiryDate->diffInMonths($approvalDate); + $limitPecent = intval($limit->LIMIT_PERCENTAGE) / 100 ; + $noRek = explode(']', $limit->ACCOUNT); @endphp - - - - - - + {{-- + --}} + + + + + {{-- --}} + + @endforeach @else @@ -240,18 +286,19 @@ @endif @if(count($data['DataFasilitas'])>0) - @php $i=1 @endphp + @php $i=1 + @endphp @foreach ($data['DataFasilitas'] as $fasilitas) - - + - - - + + + + @endforeach @else @@ -261,20 +308,24 @@ @endif -
NoJenis FasilitasCabangJenis RekeningMata UangSaldoJangka WaktuSuku BungaTgl RealisasiTgl Jatuh TempoNoJenis FasilitasTgl RealisasiJenis RekeningMata UangSaldoJangka WaktuSuku BungaTgl RealisasiTgl Jatuh TempoKeterangan
{{ $i++ }} {{ $limit->SHORT_NAME }}{{ $limit->COMPANY_NAME }}{{ $limit->ACCOUNT_TYPE }}{{ $limit->LIMIT_CURRENCY }}{{ $limit->AVAIL_AMT }}{{ $term }} D{{ $limit->LIMIT_PERCENTAGE }} {{ $approvalDate->format('d-m-Y') }}{{ $limit->COMPANY_NAME }}{{ $limit->ACCOUNT_TYPE }}{{ $limit->LIMIT_CURRENCY }}{{ ($limit->AVAIL_AMT != 0.00) ? number_format($limit->AVAIL_AMT,2,',','.') : 'NIHIL'}}{{ $term }} {{ $limitPecent }} %{{ $approvalDate->format('d-m-Y') }}{{ $expiryDate->format('d-m-Y')}} + @if(count($noRek) > 1) +
    + @foreach ($noRek as $item) +
  • {{$item}}
    • + @endforeach +
+ @else + {{ $limit->ACCOUNT}} + @endif +
{{ $i++ }} {{ $fasilitas->jenis_fasilitas }}{{ $fasilitas->cabang }}{{ $fasilitas->jenis_rekening }}{{ $fasilitas->start_date }} {{ $fasilitas->mata_uang }}{{ $fasilitas->saldo }}{{ $fasilitas->jangka_waktu }} D{{ $fasilitas->fixed_rate }}{{ number_format( $fasilitas->saldo,2,',','.') }}{{ $fasilitas->jangka_waktu }}{{ $fasilitas->fixed_rate }} % {{ \Carbon\Carbon::parse($fasilitas->due_date)->format('d-m-Y') }}{{ $fasilitas->nomor_rekening }}


--}} +
-

Demikian data ini kami sampaikan agar dapat digunakan sebagaimana mestinya



+

Demikian data ini kami sampaikan agar dapat digunakan sebagaimana mestinya





-

{{$data['DataSigner'][0]['deputy_director_name']}}

-

Deputy Director

+
    +
  • {{$data['DataSigner'][0]['deputy_director_name']}}
    • +
  • Deputy Director
    • +
-

{{$data['DataSigner'][0]['executive_officer_name']}}

-

Executive Officer

+
    +
  • {{$data['DataSigner'][0]['executive_officer_name']}}
    • +
  • Executive Officer
    • +