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

fixing filter cabang

Browse Source
This commit is contained in:
KhatamNugraha
2024-07-15 10:15:15 +07:00
parent 7a6ec1e4bb
commit 7adf05e50f
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Http/Controllers/KonfirmasiBankController.php
View File

@ -401,7 +401,7 @@ class KonfirmasiBankController extends Controller
$arrAccount = explode(",", $request['accNo']); $arrAccount = explode(",", $request['accNo']);
$dateCoreAccount = Carbon::parse($request['startDate2']); $dateCoreAccount = Carbon::parse($request['startDate2']);
$dateCoreDepo = Carbon::parse($request['startDate2']); $dateCoreDepo = Carbon::parse($request['startDate2']);
// dd( $dateCore); $cabang = $request['cabang'];
$Account = new Account(); $Account = new Account();
$data = []; $data = [];
$DataAccounts = []; $DataAccounts = [];
@ -412,56 +412,56 @@ class KonfirmasiBankController extends Controller
$DataDepo = []; $DataDepo = [];
$GetCustomer = Nasabah::where('cif',$request['cusNo'])->first(); $GetCustomer = Nasabah::where('cif',$request['cusNo'])->first();
// $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
if ($listAccount->isEmpty()) { if ($listAccount->isEmpty()) {
$dateCoreDepo = $dateCoreDepo->addDays(1)->format('m/d/Y'); $dateCoreDepo = $dateCoreDepo->addDays(1)->format('m/d/Y');
$dateCoreAccount = $dateCoreAccount->subDays(1)->format('m/d/Y'); $dateCoreAccount = $dateCoreAccount->subDays(1)->format('m/d/Y');
// $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
if($listAccount->isEmpty()){ if($listAccount->isEmpty()){
$dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(2)->format('m/d/Y'); $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(2)->format('m/d/Y');
$dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(2)->format('m/d/Y'); $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(2)->format('m/d/Y');
//$listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
if ($listAccount->isEmpty()) { if ($listAccount->isEmpty()) {
$dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(3)->format('m/d/Y'); $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(3)->format('m/d/Y');
$dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(3)->format('m/d/Y'); $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(3)->format('m/d/Y');
//$listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
if ($listAccount->isEmpty()) { if ($listAccount->isEmpty()) {
$dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(4)->format('m/d/Y'); $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(4)->format('m/d/Y');
$dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(4)->format('m/d/Y'); $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(4)->format('m/d/Y');
// $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
if ($listAccount->isEmpty()) { if ($listAccount->isEmpty()) {
$dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(5)->format('m/d/Y'); $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(5)->format('m/d/Y');
$dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(5)->format('m/d/Y'); $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(5)->format('m/d/Y');
// $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get();
$listAccount = DPK::where('cif',$request['cusNo']) $listAccount = DPK::where('cif',$request['cusNo'])
->whereIn('no_rek', $arrAccount) ->whereIn('no_rek', $arrAccount)
->whereDate('period', $dateCoreAccount ) ->whereDate('period', $dateCoreAccount )
->where('nama_cabang','like', '%'.$cabang.'%')
->orderBy('jenis_rekening', 'DESC') ->orderBy('jenis_rekening', 'DESC')
->get(); ->get();
} }
@ -508,7 +508,7 @@ class KonfirmasiBankController extends Controller
} }
$loans = loan::where('sk_nasabah',$request['cusNo'])->whereDate('periode', $dateCoreAccount )->whereNot('outstanding', 0)->get(); $loans = loan::where('sk_nasabah',$request['cusNo'])->whereDate('periode', $dateCoreAccount )->whereNot('outstanding', 0)->where('nama_cabang','like', '%'.$cabang.'%')->get();
$DataLoan = []; $DataLoan = [];
foreach ($loans as $keyLon => $lon) { foreach ($loans as $keyLon => $lon) {
$DataLoan[$keyLon]['ACCOUNT_NUMBER'] = $lon->no_rek; $DataLoan[$keyLon]['ACCOUNT_NUMBER'] = $lon->no_rek;
@ -523,7 +523,6 @@ class KonfirmasiBankController extends Controller
} }
// $CekDepo = Dpk::where('cif',$request['cusNo'])->whereDate('period', $dateCoreAccount )->whereNot('jumlah_nominal', 0)->where('jenis_rekening', 'DEPOSITO')->first();
$fasilitas = Fasilitas::where('nomor_cif', $request['cusNo'])->where('status', 1)->get(); $fasilitas = Fasilitas::where('nomor_cif', $request['cusNo'])->where('status', 1)->get();
foreach ($fasilitas as $key3 => $val3) { foreach ($fasilitas as $key3 => $val3) {
$DataFasilitas[$key3]['jenis_fasilitas'] = $val3->jenis_fasilitas; $DataFasilitas[$key3]['jenis_fasilitas'] = $val3->jenis_fasilitas;
@ -846,4 +845,4 @@ class KonfirmasiBankController extends Controller
} }
} }

10
Resources/views/pages/index.blade.php
View File

@ -234,10 +234,10 @@
<form class="form-horizontal" id="formSigner"> <form class="form-horizontal" id="formSigner">
@csrf @csrf
<!-- Add your form fields here --> <!-- Add your form fields here -->
<input type="hidden" style="margin-bottom: 5px" name="cus_no"> <input type="text" style="margin-bottom: 5px" name="cus_no">
<input type="hidden" style="margin-bottom: 5px" name="kode_cabang" /> <input type="text" style="margin-bottom: 5px" name="kode_cabang" />
<input type="hidden" style="margin-bottom: 5px" name="startDateExport" /> <input type="text" style="margin-bottom: 5px" name="startDateExport" />
<input type="hidden" style="margin-bottom: 5px" name="endDateExport" /> <input type="text" style="margin-bottom: 5px" name="endDateExport" />
<div class="form-group row"> <div class="form-group row">
<label for="inputName" class="col-sm-4 col-form-label">Penandatangan</label> <label for="inputName" class="col-sm-4 col-form-label">Penandatangan</label>
@ -368,7 +368,7 @@
$('.loading1').show(); $('.loading1').show();
var actionUrl = $(".form_customer3").attr('action'); var actionUrl = $(".form_customer3").attr('action');
var cif = $("input[name=cif]").val(); var cif = $("input[name=cif]").val();
var kodecabang = $("input[name=kodecabang]").val(); var kodecabang = $("select[name='kodecabang']").val();
var periode = $("input[name=periode]").val(); var periode = $("input[name=periode]").val();
var startDate = $("input[name=startDate]").val(); var startDate = $("input[name=startDate]").val();
var endDate = $("input[name=endDate]").val(); var endDate = $("input[name=endDate]").val();