From 56473f70df7bd63dbd1e2f68c47e1aec7cdd902f Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 22 Mar 2023 12:49:54 +0800 Subject: [PATCH 1/5] fix checkserahlelong function tk laku lelong --- app/Http/Controllers/LelongController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index cdead92..2033003 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -563,10 +563,16 @@ class LelongController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); if($cawangan['tagarrahnbid'] == 1){ - $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',[ + $lelong = Http::withOptions(['verify' => true])->get('https://niklah.arrahn.com.my/api/portalApi',[ 'norujukan' => $request->norujukan ])->json(); $lelong = ($lelong != null) ? $lelong['lelong'] : []; + if( $lelong == null ) + { + $lelong = Lelong::on($cawangan['mysql']) + ->where('norujukan', '=', $request->norujukan) + ->first(); + } }else{ $lelong = Lelong::on($cawangan['mysql']) ->where('norujukan', '=', $request->norujukan) From ae55d6e0219f644b43a4864e1cc3d166a1b31615 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 23 Mar 2023 11:08:40 +0800 Subject: [PATCH 2/5] fix kawalan stok --- app/Http/Controllers/GadaiController.php | 90 ++++++++++++++++-------- 1 file changed, 62 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index bea74e4..0579528 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1136,10 +1136,7 @@ class GadaiController extends Controller $array_kawalanstok = []; - //////////// - ///GADAI//// - /////////// - + /* Gadai */ $gadai1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','<',$tarikh) @@ -1193,44 +1190,63 @@ class GadaiController extends Controller ///TEBUS//// /////////// - $tebus1 = Tebus::on($cawangan['mysql']) + $tebus1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','<',$tarikh) + ->where('sttebus','T') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); - $tebus2 = Tebus::on($cawangan['mysql']) + $tebus2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','<',$tarikh) + ->where('sttebus','T') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); - $tebus3 = Tebus::on($cawangan['mysql']) + + $tebus3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','<',$tarikh) + ->where('sttebus','T') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); - $tebusini1 = Tebus::on($cawangan['mysql']) + $tebusini1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','=',$tarikh) + ->where('sttebus','T') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); - $tebusini2 = Tebus::on($cawangan['mysql']) + $tebusini2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','=',$tarikh) + ->where('sttebus','T') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); - $tebusini3 = Tebus::on($cawangan['mysql']) + $tebusini3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_tebus','=',$tarikh) + ->where('sttebus','T') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); @@ -1241,45 +1257,63 @@ class GadaiController extends Controller ///////////// - $lelong1 = Lelong::on($cawangan['mysql']) + $lelong1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','<',$tarikh) + ->where('sttebus','L') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); - $lelong2 = Lelong::on($cawangan['mysql']) + $lelong2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','<',$tarikh) + ->where('sttebus','L') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); - $lelong3 = Lelong::on($cawangan['mysql']) + $lelong3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','<',$tarikh) + ->where('sttebus','L') + // ->where('t_update','<',$tarikh) + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); - $lelongini1 = Lelong::on($cawangan['mysql']) + $lelongini1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','=',$tarikh) + ->where('sttebus','L') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); - $lelongini2 = Lelong::on($cawangan['mysql']) + $lelongini2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','=',$tarikh) + ->where('sttebus','L') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); - $lelongini3 = Lelong::on($cawangan['mysql']) + $lelongini3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') - ->where('t_jual','=',$tarikh) + ->where('sttebus','L') + ->where('t_update','=',$tarikh) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); From 0592f3e3616f106ad38e12624662fc8b9fafa410 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Mar 2023 22:00:59 +0800 Subject: [PATCH 3/5] fix laporan controller --- app/Http/Controllers/LaporanController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 71531b0..64e6b43 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -92,6 +92,13 @@ class LaporanController extends Controller $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan'); $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.teller','<>','Online') + ->where('trans.trans_type','=','A') ->whereIn('norujukan',$gadaiDataKaunter) ->whereDate('tarikh_bayaran','=',$request->tarikh); From d787f1842d7478327cdd858c4460e6cfb36c395d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Mar 2023 22:04:48 +0800 Subject: [PATCH 4/5] fix laporan conroller 2 --- app/Http/Controllers/LaporanController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 64e6b43..9e87812 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -99,8 +99,8 @@ class LaporanController extends Controller }) ->where('trans.teller','<>','Online') ->where('trans.trans_type','=','A') - ->whereIn('norujukan',$gadaiDataKaunter) - ->whereDate('tarikh_bayaran','=',$request->tarikh); + ->whereIn('transaksi_keuntungan.norujukan',$gadaiDataKaunter) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','=',$request->tarikh); $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan'); From a88ba13b9806f9eda2d63199be7dd7ffa308a917 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 26 Mar 2023 00:48:11 +0800 Subject: [PATCH 5/5] fix laporan stok kawalan stok --- app/Http/Controllers/GadaiController.php | 273 +++++++---------------- 1 file changed, 84 insertions(+), 189 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 0579528..2d2d716 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1140,18 +1140,21 @@ class GadaiController extends Controller $gadai1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','<',$tarikh) + ->where('tagpalsu',0) ->whereBetween('nilaimarhun', [1, 400.99]) ->get(); $gadai2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','<',$tarikh) + ->where('tagpalsu',0) ->whereBetween('nilaimarhun', [401, 2000.99]) ->get(); $gadai3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','<',$tarikh) + ->where('tagpalsu',0) ->whereBetween('nilaimarhun', [2001, 1000000]) ->get(); @@ -1159,6 +1162,7 @@ class GadaiController extends Controller $gadaiini1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','=',$tarikh) + ->where('tagpalsu',0) // ->whereBetween('nilaimarhun', [1, 400.99]) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) @@ -1167,6 +1171,7 @@ class GadaiController extends Controller $gadaiini2 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','=',$tarikh) + ->where('tagpalsu',0) // ->whereBetween('nilaimarhun', [401, 2000.99]) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) @@ -1175,20 +1180,13 @@ class GadaiController extends Controller $gadaiini3 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('t_gadai','=',$tarikh) + ->where('tagpalsu',0) // ->whereBetween('nilaimarhun', [2001, 100000]) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); - // dd($gadaiini3); - - - - - - //////////// - ///TEBUS//// - /////////// + /*tebus*/ $tebus1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') @@ -1198,6 +1196,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); @@ -1210,6 +1209,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); @@ -1223,6 +1223,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); @@ -1231,6 +1232,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','T') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); @@ -1239,6 +1241,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','T') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); @@ -1247,15 +1250,13 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','T') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); - ////////////// - ///LELONG///// - ///////////// - + /*lelong*/ $lelong1 = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') @@ -1265,6 +1266,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); @@ -1278,6 +1280,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); @@ -1290,6 +1293,7 @@ class GadaiController extends Controller $query->where('t_update','<',$tarikh) ->orWhereNull('t_update'); }) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); @@ -1298,6 +1302,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','L') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',1) ->where('nilaimarhun','<=',400.99) ->get(); @@ -1306,6 +1311,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','L') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',401) ->where('nilaimarhun','<=',2000.99) ->get(); @@ -1314,72 +1320,13 @@ class GadaiController extends Controller ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') ->where('sttebus','L') ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) ->where('nilaimarhun','>=',2001) ->where('nilaimarhun','<=',1000000) ->get(); - if($kodcaw == 'KB2') - { - - // $kawalanstoklama = KawalanStokLama::on($cawangan['mysql']) - // ->get(); - - // foreach($kawalanstoklama as $indexgad => $gadaikawalanstok) - // { - // //Gadai - // $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']); - // $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']); - // $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']); - // $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']); - // $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']); - // $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']); - - // $gadai1[0]['bil'] = $gad1; - // $gadai1[0]['pinj'] = $gadpinj1; - // $gadai2[0]['bil'] = $gad2; - // $gadai2[0]['pinj'] = $gadpinj2; - // $gadai3[0]['bil'] = $gad3; - // $gadai3[0]['pinj'] = $gadpinj3; - - // //Tebus - - // $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']); - // $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']); - // $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']); - // $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']); - // $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']); - // $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']); - - // $tebus1[0]['bil'] = $teb1; - // $tebus1[0]['pinj'] = $tebpinj1; - // $tebus2[0]['bil'] = $teb2; - // $tebus2[0]['pinj'] = $tebpinj2; - // $tebus3[0]['bil'] = $teb3; - // $tebus3[0]['pinj'] = $tebpinj3; - - // //Lelong - - // $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']); - // $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']); - // $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']); - // $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']); - // $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']); - // $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']); - - // $lelong1[0]['bil'] = $lel1; - // $lelong1[0]['pinj'] = $lelpinj1; - // $lelong2[0]['bil'] = $lel2; - // $lelong2[0]['pinj'] = $lelpinj2; - // $lelong3[0]['bil'] = $lel3; - // $lelong3[0]['pinj'] = $lelpinj3; - - } - - - ////////////////// - /////ANSURAN////// - ////////////////// + /*ansuran*/ $daterequest = new Carbon($tarikh); @@ -1413,17 +1360,6 @@ class GadaiController extends Controller ->get(); - // if($ansuran1_data){ - // foreach($ansuran1_data as $index=>$ansuran1Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){ - // array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]); - // } - // } - // } - // } - $ansuranharini1_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { @@ -1437,19 +1373,6 @@ class GadaiController extends Controller ->pluck('trans.norujukan'); - // $ansuranharini1 = []; - - // if($ansuranharini1_data){ - // foreach($ansuranharini1_data as $index=>$ansuranharini1Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){ - // array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]); - // } - // } - // } - // } - $ansuran1harini = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuranharini1_data) // ->whereBetween('nilaimarhun', [1, 400.99]) @@ -1478,19 +1401,6 @@ class GadaiController extends Controller ->pluck('trans.norujukan'); - // $ansuran2 = []; - - // if($ansuran2_data){ - // foreach($ansuran2_data as $index=>$ansuran2Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){ - // array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]); - // } - // } - // } - // } - $ansuran2 = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuran2_data) // ->whereBetween('nilaimarhun', [401, 2000.99]) @@ -1518,18 +1428,6 @@ class GadaiController extends Controller ->where('trans.kodcaw',$kodcaw) ->pluck('trans.norujukan'); - // $ansuranharini2 = []; - - // if($ansuranharini2_data){ - // foreach($ansuranharini2_data as $index=>$ansuranharini2Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){ - // array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]); - // } - // } - // } - // } $ansuran2harini = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuranharini2_data) @@ -1557,18 +1455,6 @@ class GadaiController extends Controller ->where('trans.kodcaw',$kodcaw) ->pluck('trans.norujukan'); - // $ansuran3 = []; - - // if($ansuran3_data){ - // foreach($ansuran3_data as $index=>$ansuran3Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){ - // array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]); - // } - // } - // } - // } $ansuran3 = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuran3_data) @@ -1599,20 +1485,6 @@ class GadaiController extends Controller ->pluck('trans.norujukan'); - // $ansuranharini3 = []; - - // if($ansuranharini3_data){ - // foreach($ansuranharini3_data as $index=>$ansuranharini3Data){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first(); - // if($gadaiData){ - // if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){ - // array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]); - // } - // } - // } - // } - - $ansuran3harini = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuranharini3_data) // ->whereBetween('nilaimarhun', [2001, 1000000]) @@ -1637,57 +1509,80 @@ class GadaiController extends Controller $arrayharinians3 = ['bil' => $transaksi3harini[0]->bil, 'pinj' => $transaksi3harini[0]->total]; - ////////////////// - ///HAPUS KIRA///// - ////////////////// + /*hapus kira*/ - - $hapuskira1 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','<',$tarikh) - ->where('n_marhun','>=',1) - ->where('n_marhun','<=',400.99) - ->orderBy('tarikh') + $hapuskira1 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + ->where('sttebus','H') + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',1) + ->where('nilaimarhun','<=',400.99) + // ->orderBy('tarikh') ->get(); - $hapuskira2 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','<',$tarikh) - ->where('n_marhun','>=',401) - ->where('n_marhun','<=',2000.99) - ->orderBy('tarikh') + $hapuskira2 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + // ->where('tarikh','<',$tarikh) + ->where('sttebus','H') + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',401) + ->where('nilaimarhun','<=',2000.99) + // ->orderBy('tarikh') ->get(); - $hapuskira3 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','<',$tarikh) - ->where('n_marhun','>=',2001) - ->where('n_marhun','<=',1000000) - ->orderBy('tarikh') + $hapuskira3 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + // ->where('tarikh','<',$tarikh) + ->where('sttebus','H') + ->where(function ($query) use($tarikh){ + $query->where('t_update','<',$tarikh) + ->orWhereNull('t_update'); + }) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',2001) + ->where('nilaimarhun','<=',1000000) + // ->orderBy('tarikh') ->get(); - $hapuskiraini1 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','=',$tarikh) - ->where('n_marhun','>=',1) - ->where('n_marhun','<=',400.99) - ->orderBy('tarikh') + $hapuskiraini1 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + // ->where('tarikh','=',$tarikh) + ->where('sttebus','H') + ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',1) + ->where('nilaimarhun','<=',400.99) + // ->orderBy('tarikh') ->get(); - $hapuskiraini2 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','=',$tarikh) - ->where('n_marhun','>=',401) - ->where('n_marhun','<=',2000.99) - ->orderBy('tarikh') + $hapuskiraini2 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + // ->where('tarikh','=',$tarikh) + ->where('sttebus','H') + ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',401) + ->where('nilaimarhun','<=',2000.99) + // ->orderBy('tarikh') ->get(); - $hapuskiraini3 = HapusKira::on($cawangan['mysql']) - ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj') - ->where('tarikh','=',$tarikh) - ->where('n_marhun','>=',2001) - ->where('n_marhun','<=',1000000) - ->orderBy('tarikh') + $hapuskiraini3 = Gadai::on($cawangan['mysql']) + ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj') + // ->where('tarikh','=',$tarikh) + ->where('sttebus','H') + ->where('t_update','=',$tarikh) + ->where('tagpalsu',0) + ->where('nilaimarhun','>=',2001) + ->where('nilaimarhun','<=',1000000) + // ->orderBy('tarikh') ->get();