fixing konfirmasi bank uat

This commit is contained in:
KhatamNugraha
2024-04-03 09:21:34 +07:00
parent c9cf66108c
commit 2677043077
7 changed files with 129 additions and 66 deletions

View File

@ -70,7 +70,7 @@ class Account extends Model
}
public function getAccount($cif, $arrAccount, $startDate){
// $uppercaseKodeCabang = Str::upper($kodecabang);
//$uppercaseKodeCabang = Str::upper($kodecabang);
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,MAX(AC.CURRENCY)AS CURRENCY, AC.SHORT_TITLE,MAX(AC.OPENING_DATE) AS OPENING_DATE, MAX(AC.WORKING_BALANCE) AS WORKING_BALANCE, MAX(AC.CATEGORY) AS CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME')
@ -96,20 +96,34 @@ class Account extends Model
public function getAAaccount($cust, $acc){
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_ACCOUNT")->select('MATURITY_DATE','PRODUCT','TERM')
$data = DB::connection("db2")->table("STG_DB.VW_AA_ACCOUNT")->select('ARRANGEMENT_ID','MATURITY_DATE','PRODUCT','TERM','RENEWAL_DATE','START_DATE','FIXED_RATE')
// ->where('CUSTOMER', $cif)
->where('CUSTOMER', $cust)
->where('LINKED_APPL_ID', $acc)
->limit(1);
return $data;
}
public function getAA($cust, $acc, $dataCore){
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_DETAIL")
->select('LINKED_APPL_ID','CUSTOMER','RENEWAL_DATE','START_DATE','FIXED_RATE','BATCH_DATE','PRODUCT_LINE','ARR_STATUS')
// ->where('CUSTOMER', $cif)
->where('CUSTOMER', $cust)
->where('ARR_STATUS','<>', 'CLOSE')
->where('PRODUCT_LINE', 'like', "%" .'DEPOSITS' ."%")
->whereIn(DB::raw("LINKED_APPL_ID"),$acc)
->where('BATCH_DATE', $dataCore)
->groupBy('LINKED_APPL_ID','CUSTOMER','RENEWAL_DATE','START_DATE','FIXED_RATE','BATCH_DATE','PRODUCT_LINE','ARR_STATUS')
->limit(100);
return $data;
}
public function getPinjaman($cus_no, $dateCore){
//dd($cus_no, $accNo, $dateCore);
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_ARR")
->select('*')
->select('LINKED_APPL_ID','ARRANGEMENT_ID','CUSTOMER','BATCH_DATE','START_DATE','PRODUCT_LINE','PRODUCT','ARR_STATUS','CURRENCY','TERM','MATURITY_DATE','RENEWAL_DATE','FIXED_RATE')
// ->join('STG_DB.ACCOUNT AS AC', 'AA.LINKED_APPL_ID', '=', 'AC.ACCOUNT_NUMBER')
->where('CUSTOMER',$cus_no)
// ->whereIn(DB::raw("LINKED_APPL_ID"),$arr)
@ -117,7 +131,7 @@ class Account extends Model
// ->orderBy('TERM','DESC');
->where('BATCH_DATE', $dateCore)
->where('ARR_STATUS','<>', 'CLOSE')
//->where('LINKED_APPL_ID', $accNo)
->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%")
// ->groupBy('ARRANGEMENT_ID','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME')
->limit(100);
@ -125,6 +139,7 @@ class Account extends Model
}
public function getFixedRate($arrangementId, $startDate){
$data = [];
$data = DB::connection("db2")->table("STG_DB.AA_ARR_INTEREST")
@ -139,7 +154,7 @@ class Account extends Model
public function getMaturityDate($arrangementId,$startDate){
$data = [];
$data = DB::connection("db2")->table("STG_DB.AA_ACCOUNT_DETAILS")
->select('MATURITY_DATE')
->select('MATURITY_DATE','RENEWAL_DATE','START_DATE')
->where('ID' ,$arrangementId)
->where('BATCH_DATE' ,$startDate)
->limit(1)
@ -151,10 +166,10 @@ class Account extends Model
public function getTermAmount($arrangementId){
$data = [];
$data = DB::connection("db2")->table("STG_DB.AA_ARR_TERM_AMOUNT")
->select('TERM')
->select('*')
->where(DB::raw("LEFT(ID, 12)"),$arrangementId)
->orderBy('TERM','DESC')
->limit(1);
//->orderBy('TERM','DESC')
->limit(100);
return $data;
}
@ -214,4 +229,4 @@ class Account extends Model
}
}

View File

@ -112,6 +112,7 @@
$data[$key]['CURRENCY'] = $value->CURRENCY;
$data[$key]['WORKING_BALANCE'] = number_format($value->WORKING_BALANCE, 2, ',', '.') ;
}
return json_encode($data );
}
@ -119,9 +120,7 @@
public function postInfoSurat(Request $request){
$noSurat = $this->generateNomorSurat();
// $noSurat = $this->generateNomorSurat();
// $request->validate([
// 'signer' => ['required'],
// 'no_req_surat' => ['required', 'max:100'],
@ -139,7 +138,7 @@
$letter = new Letters();
$letter->no_cif = $request->cus_no;
$letter->no_surat = $noSurat;
$letter->no_surat = $request->no_surat;
$letter->tgl_surat = $tglSurat;
$letter->no_req_surat = $request->no_req_surat;
$letter->tgl_req_surat = $request->tgl_req_surat;
@ -155,26 +154,26 @@
}
private function generateNomorSurat(){
$latesNoSurat = '';
$latestRecord = letters::latest('no_surat')->select('no_surat')->first();
$tanggal = now();
$tahun = $tanggal->format('Y');
// Fungsi untuk mengonversi angka bulan menjadi romawi
$bulanRomawi = $this->numberToRoman($tanggal->format('n'));
// private function generateNomorSurat(){
// $latesNoSurat = '';
// $latestRecord = letters::latest('no_surat')->select('no_surat')->first();
// $tanggal = now();
// $tahun = $tanggal->format('Y');
// // Fungsi untuk mengonversi angka bulan menjadi romawi
// $bulanRomawi = $this->numberToRoman($tanggal->format('n'));
if($latestRecord){
$squence = substr($latestRecord['no_surat'], 0, 3);
$latesNoSurat = str_pad(intval($squence), 3, '0', STR_PAD_LEFT);
$NoUrut = str_pad(intval($latesNoSurat + 1), 3, '0', STR_PAD_LEFT);
$noSurat = " $NoUrut/SUBDIT.OPS/$bulanRomawi/$tahun";
return $noSurat;
}else {
$noSurat = "001/SUBDIT.OPS/$bulanRomawi/$tahun";
return $noSurat;
}
// if($latestRecord){
// $squence = substr($latestRecord['no_surat'], 0, 3);
// $latesNoSurat = str_pad(intval($squence), 3, '0', STR_PAD_LEFT);
// $NoUrut = str_pad(intval($latesNoSurat + 1), 3, '0', STR_PAD_LEFT);
// $noSurat = " $NoUrut/SUBDIT.OPS/$bulanRomawi/$tahun";
// return $noSurat;
// }else {
// $noSurat = "001/SUBDIT.OPS/$bulanRomawi/$tahun";
// return $noSurat;
// }
}
// }
function numberToRoman($num)
{
@ -340,8 +339,10 @@
// dd($listAccount);
$GetCustomer = $Account->getCustomer($request['cusNo'])->first();
$listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get();
$dataAADepo = $Account->getAA($request['cusNo'],$arrAccount, $dateCore)->get();
// dd( $dataAADepo);
foreach ($listAccount as $key1 => $account) {
$tenor = '';
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
$DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
$DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
@ -351,13 +352,25 @@
$DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
$DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
$DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
$DataAccounts[$key1]['MATURITY_DATE'] = '';
if ($account->CATEGORY == '6603') {
$tanggal_1 = date_create($dataAADepo[$key1]->RENEWAL_DATE);
// waktu sekarnag
$tanggal_2 = date_create($dataAADepo[$key1]->START_DATE);
$tenor = date_diff( $tanggal_1, $tanggal_2 );
$DataAccounts[$key1]['MATURITY_DATE'] = date('d-m-Y', strtotime($dataAADepo[$key1]->RENEWAL_DATE)) ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = $dataAADepo[$key1]->FIXED_RATE . ' %';
$DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . ' BLN';
} else {
$DataAccounts[$key1]['MATURITY_DATE'] = '' ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = '';
$DataAccounts[$key1]['TERM'] = '' ;
$DataAccounts[$key1]['TERM'] = '';
}
}
$Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get();
foreach ($Arrangement as $key2 => $pinjaman) {
$balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();
@ -413,6 +426,14 @@
// dd($data);
$pdf = PDF::loadview('konfirmasibank::exportPdf',['data'=>$data]);
// $canvas = $domPdf->get_canvas();
// $canvas->page_text(10, 10, "Page {PAGE_NUM} of {PAGE_COUNT}", null, 10, [0, 0, 0]);
// $font = Font_Metrics::get_font("helvetica", "bold");
//$domPdf->get_canvas()->page_text(72, 18, "Header: {PAGE_NUM} of {PAGE_COUNT}", null, 6, array(0,0,0));
$exportTime = Carbon::now();
$filename = "Kobank_" . $request['cusNo'] .'_'.$exportTime->format('YmdHis'). '.PDF';

View File

@ -9,10 +9,12 @@
margin-top: 3.5cm;
margin-right: 1.5cm;
margin-left: 1.5cm;
margin-bottom: 2cm;
}
/** Define the header rules **/
header {
/* header {
position: fixed;
top: 0cm;
left: 0cm;
@ -22,12 +24,12 @@
}
/** Define the footer rules **/
footer {
/* footer {
position: fixed;
bottom: 0cm;
left: 0cm;
right: 0cm;
},
}, */
/* table {
@ -88,12 +90,25 @@
}
.footer {
width: 100%;
text-align: center;
position: fixed;
margin-top: 1cm;
}
.header {
top: 0px;
}
.footer {
bottom: 0px;
}
.pagenum:before {
content: counter(page);
}
</style>
</head>
<body>
<ul class="no-bullets">
<li>Nomor &nbsp; : {{$data['infoSuratOld']['no_surat']}}</li>
<li>Tanggal : {{ $data['today'] }}</li>
@ -116,16 +131,16 @@
</ul>
<table style="width:100%;" class="space1" >
<thead style="background-color: dimgrey" class="class="space1"">
<thead style="background-color: dimgrey" >
<tr>
<th class="text-center space1" style="width:5%">No</th>
<th class="text-center space1" style="width:21%">Jenis Rekening</th>
<th class="text-center space1" style="width:12%">Tgl Realisasi</th>
<th class="text-center space1" style="width:7%">Mata Uang</th>
<th class="text-center space1" style="width:15%">Saldo</th>
<th class="text-center space1" style="width:10%">Jangka Waktu</th>
<th class="text-center space1" style="width:16%">Saldo</th>
<th class="text-center space1" style="width:10%">Tenor</th>
<th class="text-center space1" style="width:8%">Suku Bunga</th>
<th class="text-center space1" style="width:12%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:11%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:10%">Keterangan</th>
</tr>
</thead>
@ -161,17 +176,17 @@
<li>PINJAMAN YANG DIBERIKAN OLEH BANK KEPADA NASABAH</li>
<li>POSISI : {{ $data['batchDate'] }} </li>
</ul>
<table class="space1" style="width:100%;">
<table class="space1" style="width:100%;page-break-inside: avoid;">
<thead style="background-color: dimgrey">
<tr class="space1">
<th class="text-center space1" style="width:5%">No</th>
<th class="text-center space1" style="width:21%">Jenis Rekening</th>
<th class="text-center space1" style="width:12%">Tgl Realisasi</th>
<th class="text-center space1" style="width:7%">Mata Uang</th>
<th class="text-center space1" style="width:15%">Saldo</th>
<th class="text-center" style="width:10%">Jangka Waktu</th>
<th class="text-center space1" style="width:16%">Saldo</th>
<th class="text-center" style="width:10%">Tenor</th>
<th class="text-center space1" style="width:8%">Suku Bunga</th>
<th class="text-center space1" style="width:12%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:11%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:10%">Keterangan</th>
</tr>
</thead>
@ -202,7 +217,7 @@
</tbody>
</table><br>
<ul class="no-bullets">
<ul class="no-bullets" style="page-break-inside: avoid;">
<li>FASILITAS LAIN YANG DITERIMA OLEH NASABAH</li>
<li>POSISI : {{ $data['batchDate'] }} </li>
</ul>
@ -213,10 +228,10 @@
<th class="text-center space1" style="width:21%">Jenis Rekening</th>
<th class="text-center space1" style="width:12%">Tgl Realisasi</th>
<th class="text-center space1" style="width:7%">Mata Uang</th>
<th class="text-center space1" style="width:15%">Saldo</th>
<th class="text-center space1" style="width:10%">Jangka Waktu</th>
<th class="text-center space1" style="width:16%">Saldo</th>
<th class="text-center space1" style="width:10%">Tenor</th>
<th class="text-center space1" style="width:8%">Suku Bunga</th>
<th class="text-center space1" style="width:12%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:11%">Tgl Jatuh Tempo</th>
<th class="text-center space1" style="width:10%">Keterangan</th>
</tr>
</thead>
@ -304,8 +319,8 @@
<li>Deputy Director</li>
</ul>
</td>
<td class="space1" style="width:20%;font-size:12px;border:none">
<ul class="no-bullets">
<td class="space1" style="width:20%;font-size:12px;border:none;">
<ul class="no-bullets" style="margin-left: 50px">
<li>{{ Str::upper($data['DataSigner'][0]['executive_officer_name'])}}</li>
<li>Executive Officer</li>
</ul>
@ -313,6 +328,9 @@
</tr>
</table>
</div>
<div class="footer">
Page <span class="pagenum" style="margin-top:20px"></span>
</div>
</body>
</html>

View File

@ -68,7 +68,7 @@
<div class="col-sm-10">
<input type="hidden" id="pastYear" value="{{$data['pastYear']}}">
<input type="hidden" id="currentYear" value="{{$data['currentYear']}}">
<input type="text" class="form-control form-control-sm datepicker" name="startDate" placeholder="DD/MM/YYYY">
<input type="text" class="form-control form-control-sm datepicker" name="startDate" placeholder="DD-MM-YYYY">
</div>
{{-- <div class="col-sm-1">
<label for="colFormLabelSm" class="col-form-label col-form-label-sm">S/D</label>
@ -251,17 +251,24 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-4 col-form-label">No Surat</label>
<div class="col-sm-8">
<input type="text" class="form-control form-control-sm " name="no_surat" placeholder="Nomor Surat" required>
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-4 col-form-label">No Req Surat</label>
<div class="col-sm-8">
<input type="text" class="form-control form-control-sm " name="no_req_surat" placeholder="No Permintaan Surat" required>
<input type="text" class="form-control form-control-sm " name="no_req_surat" placeholder="No Permintaan Surat" placeholder="DD-MM-YYYY" required>
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-4 col-form-label">Tgl Req Surat</label>
<div class="col-sm-8">
<input type="text" class="form-control form-control-sm datepicker" name="tgl_req_surat" placeholder="DD/MM/YYYY" required>
<input type="text" class="form-control form-control-sm datepicker" name="tgl_req_surat" placeholder="DD-MM-YYYY" required>
</div>
</div>
<div class="form-group row">
@ -273,7 +280,7 @@
<div class="form-group row">
<label for="inputName" class="col-sm-4 col-form-label">Telepon</label>
<div class="col-sm-8">
<input type="number" class="form-control form-control-sm " name="tlp" title="Please enter valid phone number" placeholder="No Tlp">
<input type="text" class="form-control form-control-sm " name="tlp" title="Please enter valid phone number" placeholder="No Tlp">
</div>
</div>
@ -386,9 +393,9 @@
'</td><td>' + items[i]['ACCOUNT_NUMBER'] +
'</td><td>' + items[i]['COMPANY_NAME'] +
'</td><td>' + items[i]['SHORT_NAME'] +
'</td><td>' + items[i]['WORKING_BALANCE'] +
'</td><td style="text-align:right">' + items[i]['WORKING_BALANCE'] +
// '</td><td>' + items[i]['PRODUCT'] +
'</td><td>' + items[i]['CURRENCY'] + '</td>'+
'</td><td style="text-align:center">' + items[i]['CURRENCY'] + '</td>'+
'<td class="tes">'+
'<div style="padding-left:22px" class="form-check form-check-custom form-check-solid me-10">'+'<input class=" form-check-input h-20px w-20px acc_no" type="checkbox" name="account_number" value="' + items[i]['ACCOUNT_NUMBER'] + '"></div>'+
'</td>'+
@ -508,6 +515,7 @@
var endDate = $('input[name="endDate"]').val();
var acc_no = $('input[name="acc_no"]').val();
var no_req_surat = $('input[name="no_req_surat"]').val();
var no_surat = $('input[name="no_surat"]').val();
var tgl_req_surat = $('input[name="tgl_req_surat"]').val();
var email = $('input[name="email"]').val();
var tlp = $('input[name="tlp"]').val();
@ -529,6 +537,7 @@
acc_no:acc_no,
signer:signer,
no_req_surat:no_req_surat,
no_surat:no_surat,
tgl_req_surat:tgl_req_surat,
email:email,
tlp:tlp,

View File

@ -275,14 +275,14 @@
<label for="inputName" class="col-sm-3 col-form-label">Start Date</label>
<div class="col-sm-9">
<input type="text" class="form-control form-control-sm datepicker" id="startDate" name="start_date_edit"
placeholder="DD/MM/YYYY">
placeholder="DD-MM-YYYY">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">End Date</label>
<div class="col-sm-9">
<input type="text" class="form-control form-control-sm datepicker" id="dueDatae" name="due_date_edit"
placeholder="DD/MM/YYYY">
placeholder="DD-MM-YYYY">
</div>
</div>
<div class="form-group row">

View File

@ -5,7 +5,7 @@
<th scope="col">Rekening</th>
<th scope="col">Cabang</th>
<th scope="col">Jenis Rekening</th>
<th scope="col">Saldo</th>
<th scope="col" >Saldo</th>
{{-- <th scope="col">Produk</th> --}}
<th scope="col">Mata Uang</th>
{{-- <th scope="col">Tanggal Jatuh Tempo</th> --}}

View File

@ -25,7 +25,7 @@
<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="text-center">{{ number_format(floatval($item['saldo']), 2, ',', '.'); }}</td>
<td class="" style="text-align: right">{{ number_format(floatval($item['saldo']), 2, ',', '.'); }}</td>
<td class="text-center">{{$item['start_date']}}</td>
<td class="text-center">{{$item['due_date']}}</td>
<td class="text-center">{{$item['fixed_rate']}}</td>