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

fixsing fasilitas

Browse Source
This commit is contained in:
KhatamNugraha
2024-04-23 16:23:19 +07:00
parent bb8aa9634f
commit 692a816190
5 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Entities/Account.php
View File

@ -128,7 +128,7 @@ class Account extends Model
// ->join('STG_DB.ACCOUNT AS AC', 'AA.LINKED_APPL_ID', '=', 'AC.ACCOUNT_NUMBER')
->where('CUSTOMER',$cus_no)
// ->whereIn(DB::raw("LINKED_APPL_ID"),$arr)
//->where('ARR_STATUS' , 'CURRENT')
->where('ARR_STATUS' , 'CURRENT')
// ->orderBy('TERM','DESC');
->where('BATCH_DATE', $dateCore)
->where('ARR_STATUS','<>', 'CLOSE')
@ -178,7 +178,7 @@ class Account extends Model
public function getSingleAccount($acNo, $date){
$data = [];
$data = DB::connection("db2")->table("STG_DB.ACCOUNT")
->select('WORKING_BALANCE')
->select('WORKING_BALANCE','LIMIT_REF')
->where('ACCOUNT_NUMBER',$acNo)
->where('BATCH_DATE',$date)
->limit(1)
@ -188,6 +188,31 @@ class Account extends Model
return $data;
}
public function getLimitCheck($acNo, $date){
$data = [];
$data = DB::connection("db2")->table("STG_DB.LIMIT")
->select('ACCOUNT','EXPIRY_DATE','AVAIL_AMT')
->where('ACCOUNT', 'like', "%" .$acNo."%")
->where('BATCH_DATE',$date)
->limit(1)
->orderBy('ACCOUNT','DESC');
return $data;
}
public function getRateRk($acNo, $date){
$data = [];
$data = DB::connection("db2")->table("STG_DB.ACCOUNT_DEBIT_INT")
->select('DR_INT_RATE')
->where(DB::raw("LEFT(ID, 10)"),$acNo )
// ->where('ID', 'like', "%" .$acNo."%")
->where('BATCH_DATE',$date)
->limit(1)
->orderBy('INSERT_DATE','DESC');
return $data;
}
public function getCategory($category){
$data = [];
$data = DB::connection("db2")->table("STG_DB.CATEGORY")
@ -211,7 +236,7 @@ class Account extends Model
public function getAccountRK($cusNo,$date){
$data = [];
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
->select('AC.ACCOUNT_NUMBER','AC.CUSTOMER_NO','CT.SHORT_NAME','AC.WORKING_BALANCE','AC.CURRENCY','AC.SHORT_TITLE','AC.OPENING_DATE','AC.BATCH_DATE','AC.CATEGORY','LT.EXPIRY_DATE')
->select('AC.ACCOUNT_NUMBER','AC.CUSTOMER_NO','CT.SHORT_NAME','AC.WORKING_BALANCE','AC.CURRENCY','AC.SHORT_TITLE','AC.OPENING_DATE','AC.BATCH_DATE','AC.CATEGORY','LT.EXPIRY_DATE','LT.AVAIL_AMT')
->join('STG_DB.LIMIT AS LT', 'AC.ACCOUNT_NUMBER', '=', 'LT.ACCOUNT')
->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID')
->where('AC.CUSTOMER_NO',$cusNo)

31
Http/Controllers/KonfirmasiBankController.php
View File

@ -382,28 +382,35 @@
}
$Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get();
foreach ($Arrangement as $key2 => $pinjaman) {
$balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();
// dd($balance);
foreach ($Arrangement as $key2 => $pinjaman) {
$limtiCheck = $Account->getLimitCheck($pinjaman->LINKED_APPL_ID,$startDate)->first();
$DataPinjaman[$key2]['ARRANGEMENT_ID'] = $pinjaman->ARRANGEMENT_ID;
$DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE;
$DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY;
$DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT;
$DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($balance->WORKING_BALANCE, 2, ',', '.') ?? '';
$DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($limtiCheck->AVAIL_AMT, 2, ',', '.') ?? '';
$DataPinjaman[$key2]['TERM'] = $this->convertDateToMonth($pinjaman->TERM) ?? '';
$DataPinjaman[$key2]['FIXED_RATE'] = $pinjaman->FIXED_RATE ?? '';
$DataPinjaman[$key2]['MATURITY_DATE'] = date('d-m-Y', strtotime($pinjaman->MATURITY_DATE)) ?? '';
$DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->LINKED_APPL_ID;
}
$listAccountRK = $Account->getAccountRK($request['cusNo'], $dateCore )->get();
foreach ($listAccountRK as $rk => $valRk) {
if ( $valRk->CATEGORY == '1003') {
$rateRK = "";
$rateDebitRk = $Account->getRateRk($valRk->ACCOUNT_NUMBER, $dateCore )->first();
if( $rateDebitRk->DR_INT_RATE == "0"){
$rateRK = $rateDebitRk->DR_INT_RATE;
}else{
$rateRK = substr($rateDebitRk->DR_INT_RATE, 0, -2); ;
}
$DataRK[$rk]['ACCOUNT_NUMBER'] = $valRk->ACCOUNT_NUMBER;
$DataRK[$rk]['OPENING_DATE'] = $valRk->OPENING_DATE;
$DataRK[$rk]['BATCH_DATE'] = $valRk->BATCH_DATE;
@ -411,15 +418,18 @@
$DataRK[$rk]['SHORT_NAME'] = $valRk->SHORT_NAME;
$DataRK[$rk]['CURRENCY'] = $valRk->CURRENCY;
$DataRK[$rk]['PRODUCT'] = $valRk->SHORT_TITLE;
$DataRK[$rk]['WORKING_BALANCE'] = $valRk->WORKING_BALANCE != null ? number_format($valRk->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
$DataRK[$rk]['WORKING_BALANCE'] = $valRk->AVAIL_AMT != null ? number_format($valRk->AVAIL_AMT, 2, ',', '.') : 'NIHIL';
$DataRK[$rk]['MATURITY_DATE'] = date('d-m-Y', strtotime($valRk->EXPIRY_DATE)) ?? ''; ;
$DataRK[$rk]['ARRANGEMENT_ID'] = '';
$DataRK[$rk]['FIXED_RATE'] = '';
$DataRK[$rk]['TERM'] = '';
$DataRK[$rk]['FIXED_RATE'] = $rateRK;
$DataRK[$rk]['TERM'] = '12';
}
}
$fasilitas = Fasilitas::where('nomor_cif',$request['cusNo'] )->where('status',1)->get();
foreach ($fasilitas as $key3 => $val3) {
$DataFasilitas[$key3]['jenis_fasilitas'] = $val3->jenis_fasilitas;
@ -456,6 +466,7 @@
// $data['infoSuratOld'] = $infoSuratOld;
$data['infoSuratNew'] = $infoSuratNew;
// dd($data);
$pdf = PDF::loadview('konfirmasibank::exportPdf',['data'=>$data]);
@ -536,8 +547,8 @@
$Category = Category::all();
$Company = Company::all();
// dd($fasilitas);
$limitReference = LimitReference::all();
$data['queryParam'] = $request->query();
$data['fasilitas'] = $fasilitas;
$data['limitReference'] = $limitReference;

44
Resources/views/exportPdf.blade.php
View File

@ -216,8 +216,8 @@
<td class="text-center space1 "></td>
<td class="text-center space1">{{ $dtRK['CURRENCY'] }}</td>
<td class="text-right space1">{{$dtRK['WORKING_BALANCE']}}</td>
<td class="text-center space1"></td>
<td class="text-center space1"></td>
<td class="text-center space1">{{$dtRK['TERM']}} BLN</td>
<td class="text-center space1">{{$dtRK['FIXED_RATE']}} %</td>
<td class="text-center space1">{{$dtRK['MATURITY_DATE']}}</td>
<td class="text-center space1">{{ $dtRK['ACCOUNT_NUMBER'] }}</td>
</tr>
@ -249,45 +249,6 @@
</tr>
</thead>
<tbody>
@if (count($data['DataLimit']) > 0 OR count($data['DataFasilitas']) > 0 )
@if (count($data['DataLimit']) > 0)
@php $i=1 @endphp
@foreach ($data['DataLimit'] as $limit)
@php
$approvalDate = \Carbon\Carbon::parse($limit->APPROVAL_DATE);
$expiryDate = \Carbon\Carbon::parse($limit->EXPIRY_DATE);
$term = $expiryDate->diffInMonths($approvalDate);
$limitPecent = intval($limit->LIMIT_PERCENTAGE) / 100 ;
$noRek = explode(']', $limit->ACCOUNT);
//conver term
@endphp
<tr class="space1">
<td class="text-center space1">{{ $i++ }}</td>
<td class="space1">{{ $limit->SHORT_NAME }}</td>
<td class="text-center space1"></td>
{{-- <td class="text-center space1">{{ $approvalDate->format('d-m-Y') }}</td> --}}
<td class="text-center space1">{{ $limit->LIMIT_CURRENCY }}</td>
<td class="space1 text-right">
{{ ($limit->AVAIL_AMT != 0.00) ? number_format($limit->AVAIL_AMT,2,',','.') : 'NIHIL'}}</td>
<td class="text-center space1">{{ $term }} BLN </td>
<td class="text-center space1">{{ $limitPecent }} %</td>
<td class="text-center space1">{{ $expiryDate->format('d-m-Y')}}</td>
<td class="text-center space1">
@if(count($noRek) > 1)
<ul class="no-bullets">
@foreach ($noRek as $item)
<li style=" font-family: Times New Roman,Times, sans-serif;font-size:12px">{{$item}}</li>
@endforeach
</ul>
@else
{{ $limit->ACCOUNT}}
@endif
</td>
</tr>
@endforeach
@endif
@if (count($data['DataFasilitas']) > 0 )
@php
$no = 0;
@ -312,7 +273,6 @@
<td class="text-center space1">{{ $fasilitas['nomor_rekening'] }}</td>
</tr>
@endforeach
@endif
@else
<tr class="space1">
<td class="space1" colspan="9" style="text-align: center;">NIHIL</td>

8
Resources/views/pages/index_fasilitas.blade.php
View File

@ -473,6 +473,14 @@
history.back();
})
// Fungsi untuk memeriksa apakah suatu nilai adalah float
function isFloat(value) {
// Menggunakan parseFloat untuk mengubah string menjadi float
var floatValue = parseFloat(value);
// Memeriksa apakah hasil konversi bukan NaN dan apakah nilai asli sama dengan versi float-nya
return !isNaN(floatValue) && floatValue == value;
}
});
</script>

7
Resources/views/pages/table_fasilitas.blade.php
View File

@ -25,7 +25,12 @@
<td class="text-center">{{$item['jenis_fasilitas']}}</td>
<td class="text-center">{{$item['cabang']}}</td>
<td class="text-center">{{$item['jenis_rekening']}}</td>
<td class="" style="text-align: right">{{ number_format(floatval($item['saldo']), 2, ',', '.'); }}</td>
<td class="" style="text-align: right">{{ number_format(floatval($item['saldo']), 2, ',', '.') }}</td>
{{-- @if (isFloat($item['saldo']))
<td class="" style="text-align: right">{{ number_format(floatval($item['saldo']), 2, ',', '.') }}</td>
@else
<td class="" style="text-align: right">{{ number_format($item['saldo'], 2, ',', '.') }} </td>
@endif --}}
<td class="text-center">{{$item['start_date']}}</td>
<td class="text-center">{{$item['due_date']}}</td>
<td class="text-center">{{$item['fixed_rate']}}</td>