fixing data pinjaman
This commit is contained in:
@ -98,76 +98,132 @@ class KonfirmasiBankController extends Controller
|
||||
public function getData(Request $request)
|
||||
{
|
||||
|
||||
$data = [];
|
||||
$Account = new Account();
|
||||
$arrAccount = [];
|
||||
$data = [];
|
||||
$dataAccount = [];
|
||||
$dataLoan = [];
|
||||
$startDate = Carbon::parse($request->startDate);
|
||||
$startDateLoan = Carbon::parse($request->startDate);
|
||||
|
||||
//$dateCore = $startDate->format('m/d/Y');
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan )
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
->get();
|
||||
|
||||
// $Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate)->get();
|
||||
$Accounts = Dpk::where('cif',$request->cif)
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan->subDays(1)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate )
|
||||
->get();
|
||||
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan->subDays(2)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan->subDays(3)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan->subDays(4)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::where('sk_nasabah',$request->cif)
|
||||
->whereDate('periode',$startDateLoan->subDays(5)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
->get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
$Accounts = Dpk::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate )
|
||||
->get();
|
||||
|
||||
if ($Accounts->isEmpty()) {
|
||||
// $Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(1)->format('m/d/Y'))->get();
|
||||
$Accounts = DPK::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate->subDays(1)->format('m/d/Y') )
|
||||
->get();
|
||||
if($Accounts->isEmpty()){
|
||||
|
||||
|
||||
if($Accounts->isEmpty() ){
|
||||
// $Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(2)->format('m/d/Y'))->get();
|
||||
$Accounts = DPK::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate->subDays(2)->format('m/d/Y') )
|
||||
->get();
|
||||
|
||||
if ($Accounts->isEmpty()) {
|
||||
// $Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(3)->format('m/d/Y'))->get();
|
||||
$Accounts = DPK::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate->subDays(3)->format('m/d/Y') )
|
||||
->get();
|
||||
if ($Accounts->isEmpty()) {
|
||||
//$Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(4)->format('m/d/Y'))->get();
|
||||
$Accounts = DPK::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate->subDays(4)->format('m/d/Y') )
|
||||
->get();
|
||||
if ($Accounts->isEmpty()) {
|
||||
//$Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate->subDays(5)->format('m/d/Y'))->get();
|
||||
$Accounts = DPK::where('cif',$request->cif)
|
||||
->where('nama_cabang','like', '%'.$request->kodecabang.'%')
|
||||
//->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period',$startDate->subDays(5)->format('m/d/Y') )
|
||||
->get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$Accounts = $Account->getSearchAccount($request->cif, $arrAccount, $request->kodecabang, $startDate)->get();
|
||||
}
|
||||
|
||||
|
||||
|
||||
foreach ($Accounts as $key => $value) {
|
||||
$data[$key]['ACCOUNT_NUMBER'] = $value->no_rek;
|
||||
$data[$key]['COMPANY_NAME'] = $value->nama_cabang;
|
||||
$data[$key]['SHORT_NAME'] = $value->jenis_rekening;
|
||||
$data[$key]['CURRENCY'] = $value->kode_mata_uang;
|
||||
$data[$key]['WORKING_BALANCE'] = number_format($value->jumlah_nominal, 2, ',', '.') ;
|
||||
$dataAccount[$key]['ACCOUNT_NUMBER'] = $value->no_rek;
|
||||
$dataAccount[$key]['COMPANY_NAME'] = $value->nama_cabang;
|
||||
$dataAccount[$key]['SHORT_NAME'] = $value->jenis_rekening;
|
||||
$dataAccount[$key]['CURRENCY'] = $value->kode_mata_uang;
|
||||
$dataAccount[$key]['WORKING_BALANCE'] = number_format(abs($value->jumlah_nominal), 2, ',', '.') ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
return json_encode($data);
|
||||
foreach ($Loans as $key2 => $loan) {
|
||||
$dataLoan[$key2]['ACCOUNT_NUMBER'] = $loan->no_rek;
|
||||
$dataLoan[$key2]['COMPANY_NAME'] = $loan->nama_cabang;
|
||||
$dataLoan[$key2]['SHORT_NAME'] = $loan->product_loan;
|
||||
$dataLoan[$key2]['CURRENCY'] = $loan->kode_mata_uang;
|
||||
$dataLoan[$key2]['WORKING_BALANCE'] = number_format(abs($loan->outstanding), 2, ',', '.') ;
|
||||
|
||||
}
|
||||
|
||||
$data = array_merge($dataAccount, $dataLoan);
|
||||
|
||||
return json_encode($data );
|
||||
}
|
||||
|
||||
|
||||
@ -401,6 +457,7 @@ class KonfirmasiBankController extends Controller
|
||||
$arrAccount = explode(",", $request['accNo']);
|
||||
$dateCoreAccount = Carbon::parse($request['startDate2']);
|
||||
$dateCoreDepo = Carbon::parse($request['startDate2']);
|
||||
$startDateLoan = Carbon::parse($request['startDate2']);
|
||||
$cabang = $request['cabang'];
|
||||
$Account = new Account();
|
||||
$data = [];
|
||||
@ -412,6 +469,57 @@ class KonfirmasiBankController extends Controller
|
||||
$DataDepo = [];
|
||||
$GetCustomer = Nasabah::where('cif',$request['cusNo'])->first();
|
||||
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan )
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
|
||||
|
||||
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan->subDays(1)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
|
||||
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan->subDays(2)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan->subDays(3)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan->subDays(4)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
if ($Loans->isEmpty()) {
|
||||
$Loans =Loan::whereIn('no_rek',$arrAccount)
|
||||
->whereDate('periode',$startDateLoan->subDays(5)->format('m/d/Y') )
|
||||
->whereNotNull('kode_status_lunas')
|
||||
->where('outstanding', '<>', 0)
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$listAccount = DPK::where('cif',$request['cusNo'])
|
||||
->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period', $dateCoreAccount )
|
||||
@ -419,11 +527,12 @@ class KonfirmasiBankController extends Controller
|
||||
->orderBy('jenis_rekening', 'DESC')
|
||||
->get();
|
||||
|
||||
|
||||
if ($listAccount->isEmpty()) {
|
||||
$dateCoreDepo = $dateCoreDepo->addDays(1)->format('m/d/Y');
|
||||
$dateCoreAccount = $dateCoreAccount->subDays(1)->format('m/d/Y');
|
||||
$listAccount = DPK::where('cif',$request['cusNo'])
|
||||
->whereIn('no_rek', $arrAccount)
|
||||
// ->whereIn('no_rek', $arrAccount)
|
||||
->whereDate('period', $dateCoreAccount )
|
||||
->where('nama_cabang','like', '%'.$cabang.'%')
|
||||
->orderBy('jenis_rekening', 'DESC')
|
||||
@ -470,6 +579,8 @@ class KonfirmasiBankController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// try {
|
||||
foreach ($listAccount as $key1 => $account) {
|
||||
|
||||
@ -507,10 +618,8 @@ class KonfirmasiBankController extends Controller
|
||||
|
||||
}
|
||||
|
||||
|
||||
$loans = loan::where('sk_nasabah',$request['cusNo'])->whereDate('periode', $dateCoreAccount )->whereNot('outstanding', 0)->where('nama_cabang','like', '%'.$cabang.'%')->get();
|
||||
$DataLoan = [];
|
||||
foreach ($loans as $keyLon => $lon) {
|
||||
foreach ($Loans as $keyLon => $lon) {
|
||||
$DataLoan[$keyLon]['ACCOUNT_NUMBER'] = $lon->no_rek;
|
||||
$DataLoan[$keyLon]['BATCH_DATE'] = $lon->periode;
|
||||
$DataLoan[$keyLon]['SHORT_NAME'] = $lon->product_loan;
|
||||
@ -845,4 +954,4 @@ class KonfirmasiBankController extends Controller
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
@ -385,6 +385,7 @@
|
||||
data: $(this).serialize(),
|
||||
dataType: "json",
|
||||
success: function (items) {
|
||||
|
||||
$('.loading1').hide();
|
||||
let dateString ='';
|
||||
$.each(items, function(i, index) {
|
||||
|
Reference in New Issue
Block a user