update temuan sit 11092023

This commit is contained in:
KhatamNugraha
2023-09-11 14:06:17 +07:00
parent 9944dac2e4
commit d7adee753c
6 changed files with 123 additions and 57 deletions

View File

@ -0,0 +1,35 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('fasilitas', function (Blueprint $table) {
$table->string('cabang')->nullable()->change();
$table->string('periode')->nullable()->change();
$table->string('jenis_rekening')->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('fasilitas', function (Blueprint $table) {
});
}
};

View File

@ -38,7 +38,8 @@ class ViewAccount extends Model
'ARRANGEMENT_ID'"
];
public function getSearchAccount($cif , $kodecabang, $periode){
public function getSearchAccount($cif , $kodecabang, $startDate, $endDate){
// dd($cif , $kodecabang, $startDate, $endDate);
// $store = DB::connection('oracle');
$today = Carbon::now();
$currentYear = $today->format("Y");
@ -47,21 +48,27 @@ class ViewAccount extends Model
$data = [];
if ($cif != null && $kodecabang == null && $periode == null) {
if ($cif != null && $kodecabang == null && $startDate == null) {
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
->where('CUSTOMER_NO',$cif)
->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
} elseif ($cif != null && $kodecabang != null && $periode == null) {
dd('tess2');
->whereBetween('BATCH_DATE', [$startDate, $endDate])
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
} elseif ($cif != null && $kodecabang != null && $startDate == null) {
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
->where('CUSTOMER_NO',$cif)
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
->whereBetween('BATCH_DATE', [$startDate, $endDate])
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
}else {
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
->where('CUSTOMER_NO',$cif)
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
->where('BATCH_DATE','LIKE','%'.$periode.'%');
->whereBetween('BATCH_DATE', [$startDate, $endDate])
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
}
return $data;
@ -69,7 +76,11 @@ class ViewAccount extends Model
public function getAccount($cus_no,$account,$kodecabang,$periode){
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")->select('*')->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account)->get();
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account)
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE')
->get();
return $data;
}
@ -134,4 +145,4 @@ class ViewAccount extends Model
return $data;
}
}
}

View File

@ -36,18 +36,23 @@
public function index(Request $request)
{
if (is_null($this->user) || !$this->user->can('konfirmasibank.create')) {
abort(403, 'Sorry !! You are Unauthorized to view any master data !');
}
// dd($request);
$data = [];
// Tanggal awal
// Contoh tanggal saat ini
$today = Carbon::now();
// dd( $today->format());
// Menambahkan 1 tahun ke tanggal saat ini
$currentYear = $today->format("Y");
$currentYear = $today->format("Y-m-d");
// Menambahkan 5 tahun ke tanggal saat ini
$pastYear = $today->subYear(3)->format('Y');
$signer = Signer::all();
$pastYear = $today->subYear(3)->format('Y-m-d');
$signer = Signer::where('status',1)->get();
$data['currentYear'] = $currentYear;
$data['pastYear'] = $pastYear;
@ -69,7 +74,13 @@
$data = [];
$Account = new ViewAccount;
$Accounts = $Account->getSearchAccount($request->cif, $request->kodecabang,$request->periode)->get();
$carbonStartDate = Carbon::createFromFormat('Y-m-d', $request->startDate);
$formattedStartDate = $carbonStartDate->format('d/m/Y');
$carbonEndDate = Carbon::createFromFormat('Y-m-d', $request->endDate);
$formattedEndDate = $carbonEndDate->format('d/m/Y');
$Accounts = $Account->getSearchAccount($request->cif, $request->kodecabang,$formattedStartDate,$formattedEndDate)->get();
foreach ($Accounts as $key => $account) {
$data[$key]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
$data[$key]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
@ -97,6 +108,7 @@
abort(403, 'Sorry !! You are Unauthorized to view any master data !');
}
$account = explode("," , $request['acc_no']);
$ViewAccount = new ViewAccount;
@ -171,23 +183,9 @@
$ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']);
// foreach ($ListLimits as $key4 => $val) {
// $limitArr[$key4]['CUSTOMER'] = $item->CUSTOMER;
// $limitArr[$key4]['SHORT_NAME'] = $item->SHORT_NAME;
// $limitArr[$key4]['STREET'] = $item->STREET;
// $limitArr[$key4]['ADDRESS'] = $item->ADDRESS;
// $limitArr[$key4]['COMPANY_NAME'] = $item->COMPANY_NAME;
// $limitArr[$key4]['CURRENCY'] = $item->CURRENCY;
// $limitArr[$key4]['PRODUCT_LINE'] = $item->PRODUCT_LINE;
// $limitArr[$key4]['PRODUCT'] = $item->PRODUCT;
// $limitArr[$key4]['WORKING_BALANCE'] = $item->WORKING_BALANCE;
// $limitArr[$key4]['BATCH_DATE'] = $item->OPENING_DATE;
// }
$fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get();
$signer = Signer::where('id', $request['signer'])->get();
$signer = Signer::where('id', $request['signer'])->where('status',1)->get();
$currentDate = Carbon::now();
$tanggalIndonesia = $currentDate->locale('id')->isoFormat('dddd, D MMMM YYYY');
@ -299,8 +297,7 @@
}
$data = [];
$fasilitas = Fasilitas::paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['batch_date'], $request->query()['status']);
$fasilitas = Fasilitas::where('status',1)->paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['startDateFasilitas'],$request->query()['startDateFasilitas']);
$Category = Category::all();
$Company = Company::all();
// dd($fasilitas);
@ -549,4 +546,4 @@
}
}
}

View File

@ -60,20 +60,20 @@
<div class="content">
<p>Nomor &nbsp; : 577/SUBDIT.OPS/VIII/2023</p>
<p>Tanggal : {{ $data['localDate'] }}</p><br>
<p>Tanggal : {{ strtoupper($data['localDate']) }}</p><br>
<p>Kepada Yth</p>
<P>{{$data['DataPinjaman'][0]['SHORT_NAME']}}</P>
<p>{{$data['DataPinjaman'][0]['STREET']}}, {{$data['DataPinjaman'][0]['ADDRESS']}}</p>
<p>{{$data['DataPinjaman'][0]['STREET']}}, {{str_replace(']','',$data['DataPinjaman'][0]['ADDRESS'])}}</p>
<p>Sesuai dengan surat saudara Nomor <span>150/KB-SENTRA1/II/2023</span> tanggal {{ $data['localDate'] }} dengan ini kami smpaikan data data nasabah sesuai permintaan saudara sebagai berikut : </p>
<p>Sesuai dengan surat saudara Nomor <span>150/KB-SENTRA1/II/2023</span> tanggal {{ strtoupper($data['localDate']) }} dengan ini kami sampaikan data data nasabah sesuai permintaan saudara sebagai berikut : </p>
<p>Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}</p>
<p>Nomor CIF &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</p><br>
<p style="font-size: 12px;"> SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK</p>
<p style="font-size: 12px;">POSISI {{ $data['localDate'] }}</p>
<p style="font-size: 12px;">POSISI {{ strtoupper($data['localDate']) }}</p>
<table class="space1" style="width:100%;">
<thead style="background-color: dimgrey">
<tr class="space1" >
@ -84,7 +84,7 @@
<th class="space1">Mata Uang</th>
<th class="space1">Saldo</th>
<th class="space1">Jangka Waktu</th>
<th class="space1">Suku Bung</th>
<th class="space1">Suku Bunga</th>
<th class="space1">Tgl Jatuh Tempo</th>
</tr>
</thead>
@ -106,15 +106,15 @@
@endforeach
@else
<tr class="space1">
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Account</td>
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Data Yang Ditampilkan</td>
</tr>
@endif
</tbody>
</table><br>
<p style="font-size: 12px;">PINJAMAN YANG DI BERIKAN OLEH BANK KEPADA NASABAH</p>
<p style="font-size: 12px;">POSISI {{ $data['localDate'] }}</p>
<p style="font-size: 12px;">PINJAMAN YANG DIBERIKAN OLEH BANK KEPADA NASABAH</p>
<p style="font-size: 12px;">POSISI {{ strtoupper($data['localDate']) }}</p>
<table class="space1" style="width:100%;">
<thead style="background-color: dimgrey">
<tr class="space1" >
@ -125,7 +125,7 @@
<th class="space1 ">Mata Uang</th>
<th class="space1">Saldo</th>
<th class="space1">Jangka Waktu</th>
<th class="space1">Suku Bung</th>
<th class="space1">Suku Bunga</th>
<th class="space1">Tgl Jatuh Tempo</th>
</tr>
</thead>
@ -147,14 +147,14 @@
@endforeach
@else
<tr class="space1">
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Pinjaman</td>
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Data Pinjaman Yang Ditampilkan</td>
</tr>
@endif
</tbody>
</table><br>
<p style="font-size: 12px;">FASILITAS LAIN YANG DI TERIMA OLEH NASABAH</p>
<p style="font-size: 12px;">POSISI {{ $data['localDate'] }}</p>
<p style="font-size: 12px;">FASILITAS LAIN YANG DITERIMA OLEH NASABAH</p>
<p style="font-size: 12px;">POSISI {{ strtoupper($data['localDate']) }}</p>
<table class="space1" style="width:100%;">
<thead style="background-color: dimgrey">
<tr class="space1" >
@ -165,7 +165,7 @@
<th class="space1">Mata Uang</th>
<th class="space1">Saldo</th>
<th class="space1">Jangka Waktu</th>
<th class="space1">Suku Bung</th>
<th class="space1">Suku Bunga</th>
<th class="space1">Tgl Jatuh Tempo</th>
</tr>
</thead>
@ -190,6 +190,10 @@
<td class="space1">{{ $limit->EXPIRY_DATE}}</td>
</tr>
@endforeach
@else
<tr class="space1">
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Fasilitas Dari Core</td>
</tr>
@endif
@if(count($data['DataFasilitas'])>0)
@ -209,13 +213,15 @@
@endforeach
@else
<tr class="space1">
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Fasilitas</td>
<td class="space1" colspan="9" style="text-align: center;">Tidak Ada Fasilitas Tambahan</td>
</tr>
@endif
</tbody>
</table><br><br>
<p>Demikian data ini kami sampaikan agar dapat digunakan sebagaimana mestinya</p> <br><br>
<div style="width:300px" class>
<table style="width:100%;" class="space1 no-border-table">
<tr class="space1" style="height:500px">

View File

@ -43,8 +43,14 @@
</div>
<div class="row mb-3">
<label for="colFormLabelSm" class="col-sm-2 col-form-label col-form-label-sm">Periode <span style="color:red">*</span></label>
<div class="col-sm-10">
<input type="number" class="form-control form-control-sm" min="{{$data['pastYear']}}" max="{{$data['currentYear']}}" name="periode" clear id="periode" placeholder="Periode">
<div class="col-sm-4">
<input type="date" class="form-control form-control-sm" min="{{$data['pastYear']}}" max="{{$data['currentYear']}}" name="startDate" clear id="startDate" placeholder="Tanggal Mulai">
</div>
<div class="col-sm-1">
<label for="colFormLabelSm" class="col-form-label col-form-label-sm">S/D</label>
</div>
<div class="col-sm-5">
<input type="date" class="form-control form-control-sm" min="{{$data['pastYear']}}" max="{{$data['currentYear']}}" name="endDate" clear id="endDate" placeholder="Tanggal Selesai">
</div>
</div>
<div class="text-end">
@ -77,7 +83,8 @@
<form class="formFasilitas" action="{{ route($route[0].'.fasilitas') }}" >
@csrf
<input type="hidden" style="margin-bottom: 5px" name="cus_no_fasilitas" id="cus_no_fasilitas" />
<input type="hidden" style="margin-bottom: 5px" name="batch_date" id="batch_date" />
<input type="hidden" style="margin-bottom: 5px" name="startDateFasilitas" id="startDateFasilitas" />
<input type="hidden" style="margin-bottom: 5px" name="endDateFasilitas" id="endDateFasilitas" />
<input type="hidden" style="margin-bottom: 5px" name="company_name" id="company_name" />
<input type="hidden" style="margin-bottom: 5px" name="status" value="1" />
<button type="submit" class="btn btn-light-info btn-sm fasilitasButton " style="margin-left:5px;display:none">
@ -190,7 +197,8 @@
<!-- Add your form fields here -->
<input type="hidden" style="margin-bottom: 5px" name="cus_no" id="acc_no2" />
<input type="hidden" style="margin-bottom: 5px" name="kode_cabang" />
<input type="hidden" style="margin-bottom: 5px" name="periode" />
<input type="hidden" style="margin-bottom: 5px" name="startDateExport" />
<input type="hidden" style="margin-bottom: 5px" name="endDateExport" />
<select class="form-select form-select-sm" aria-label="Small select example" id="signer-select" name="signer">
<option selected>Select Signer</option>
@foreach ($data['signer'] as $item)
@ -236,8 +244,13 @@
alert("Nomor CIF harus diisi.");
return; // Stop form submission
}
if ($("#periode").val() === "") {
alert("Periode harus diisi.");
if ($("#startDate").val() === "") {
alert("Tanggal mulai harus diisi.");
return; // Stop form submission
}
if ($("#endtDate").val() === "") {
alert("Tanggal selesai harus diisi.");
return; // Stop form submission
}
@ -250,10 +263,12 @@
var cif = $("input[name=cif]").val();
var kodecabang = $("input[name=kodecabang]").val();
var periode = $("input[name=periode]").val();
var startDate = $("input[name=startDate]").val();
var endDate = $("input[name=endDate]").val();
$("input[name=cus_no_fasilitas]").val(cif);
$("input[name=cus_no]").val(cif);
$("input[name=kode_cabang]").val(kodecabang);
$("input[name=periode]").val(periode);
var no = 1;
$.ajax({
@ -281,9 +296,9 @@
$(".fasilitasButton").show();
var kdcabang = $("#kodecabang").val();
var periode = $("#periode").val();
$("#company_name").val(kdcabang);
$("#batch_date").val(periode);
$("input[name=startDateFasilitas]").val(startDate);
$("input[name=endDateFasilitas]").val(endDate);
},
error: function (error) {
@ -348,7 +363,8 @@
e.preventDefault();
var cif = $('input[name="cus_no"]').val();
var cabang = $('input[name="kode_cabang"]').val();
var periode = $('input[name="periode"]').val();
var startDate = $('input[name="startDate"]').val();
var endDate = $('input[name="endDate"]').val();
var acc_no = $('input[name="acc_no"]').val();
var signer = $("#signer-select").find('option:selected').val();
$("#signerModal").modal('hide');
@ -360,7 +376,8 @@
_token: $('meta[name="csrf-token"]').attr('content'),
cus_no: cif,
kode_cabang: cabang,
periode:periode,
startDate:startDate,
endDate:endDate,
acc_no:acc_no,
signer:signer

View File

@ -50,7 +50,7 @@
</tr>
</tbody>
</table>
{{ $data['fasilitas']->appends(['cus_no_fasilitas' =>''.$data['queryParam']['cus_no_fasilitas'] .'','company_name' =>''.$data['queryParam']['company_name'].'' ,'batch_date' =>''.$data['queryParam']['batch_date'].'','status'=>1])->links('pagination::bootstrap-5') }}
{{ $data['fasilitas']->appends(['cus_no_fasilitas' =>''.$data['queryParam']['cus_no_fasilitas'] .'','company_name' =>''.$data['queryParam']['company_name'].'' ,'startDateFasilitas' =>''.$data['queryParam']['startDateFasilitas'].'','endDateFasilitas' =>''.$data['queryParam']['endDateFasilitas'].'','status'=>1])->links('pagination::bootstrap-5') }}
{{-- {!! $data['fasilitas']->links('pagination::bootstrap-5') !!} --}}
{{-- {!! $data['fasilitas']->links() !!} --}}