From aad4697700b212aa2bf45c935a6f0f7d4332d1ce Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 9 Aug 2022 18:24:40 +0800 Subject: [PATCH 1/2] fix skit2 --- app/Http/Controllers/AdminPageController.php | 48 +++++++++++++++++++- routes/web.php | 2 + 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index bd431f7..3aee53e 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2714,7 +2714,7 @@ class AdminPageController extends Controller // dd($audit->where('tempoh','<=',5)->count()); $jumlahrekod = $audit->count(); - $jumlahpinjaman = $audit->sum('pinjaman'); + $jumlahpinjaman = $audit->sum('bakipjm'); $arraycount = []; $arraysum = []; @@ -2729,7 +2729,7 @@ class AdminPageController extends Controller }else{ ${"tempoh".$i."count"} = ${"tempoh".$i}->where([['tempoh','>',$i-1],['tempoh','<=',$i]])->count(); } - ${"tempoh".$i."sum"} = ${"tempoh".$i}->sum('pinjaman'); + ${"tempoh".$i."sum"} = ${"tempoh".$i}->sum('bakipjm'); array_push($arraycount,${"tempoh".$i."count"}); array_push($arraysum,${"tempoh".$i."sum"}); } @@ -2742,4 +2742,48 @@ class AdminPageController extends Controller return response()->json($arrayall,200); } } + + public function DashboardAging(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + + $current = Carbon::now(); + $current = new Carbon(); + + $harini = $current->toDateString(); + $jenislaporan = $request->options; + + + if($jenislaporan === 'sebenar') + { + $audit = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); + + }elseif($jenislaporan === 'datalelong') + { + $audit = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); + + }else{ + $audit = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); + } + + $rekodaudit = $audit->get(); + $countaudit = $audit->count(); + + dd($countaudit); + + return response()->json($rekodaudit,200); + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 5b355c3..9ce5f33 100644 --- a/routes/web.php +++ b/routes/web.php @@ -718,6 +718,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('audit/keuntungansebenar',['uses'=>'AdminPageController@KeuntunganSebenarExport']); $router->get('laporan/aging',['uses'=>'AdminPageController@LaporanAging']); + $router->get('dashboard/aging',['uses'=>'AdminPageController@DashboardAging']); + From 3037cd15b4e919749c278c8866f9ec55beeb68e1 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 10 Aug 2022 01:31:54 +0800 Subject: [PATCH 2/2] pertambahan function untuk wtd --- app/Http/Controllers/AdminPageController.php | 69 +++++++++++++++----- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 3aee53e..da4a9b9 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2346,9 +2346,21 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $latestbatch = SerahBaki::on($cawangan['mysql'])->where('norujukan','baru')->get(); + $latestbatch = SerahBaki::on($cawangan['mysql'])->where('norujukan','baru')->get()->toArray(); + $batch_old = WTDDraft::on('mysql7')->select('kodcaw')->where('batchno_serah',0)->where('kodcaw',$request->kodcaw) + ->groupBy('kodcaw')->get(); - return response()->json($latestbatch,200); + $batch_old_noruj = WTDDraft::on('mysql7')->where('batchno_serah',0)->where('kodcaw',$request->kodcaw)->pluck('norujukan'); + $lelong_data = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$batch_old_noruj)->get(); + + foreach($batch_old as $index=>$bo) + { + array_push($latestbatch,['recno' => 0,'norujukan' => 'lama','batchno' => 0,'baki' => $lelong_data->sum('baki'),'aktif' => 1]); + } + + $data = $this->paginate($latestbatch,8); + + return response()->json($data,200); } @@ -2758,32 +2770,55 @@ class AdminPageController extends Controller if($jenislaporan === 'sebenar') { $audit = Gadai::on($cawangan['mysql']) - ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]) - ->orderBy('t_gadai', 'ASC') - ->orderBy('sirig', 'ASC'); + ->where(function ($query) use ($harini) { + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]); + }); }elseif($jenislaporan === 'datalelong') { $audit = Gadai::on($cawangan['mysql']) - ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]) - ->orderBy('t_gadai', 'ASC') - ->orderBy('sirig', 'ASC'); + // ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) + // ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); + ->where(function ($query) use ($harini) { + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); + }); }else{ $audit = Gadai::on($cawangan['mysql']) - ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]) - ->orderBy('t_gadai', 'ASC') - ->orderBy('sirig', 'ASC'); + ->where(function ($query) use ($harini) { + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]); + }); } $rekodaudit = $audit->get(); $countaudit = $audit->count(); + $sumaudit = $audit->sum('bakipjm'); - dd($countaudit); + $arraycount = []; + $arraysum = []; - return response()->json($rekodaudit,200); + for ($i = 1; $i <= 13; $i++) + { + ${"tempoh".$i} = clone $audit; + if($i == 13) + { + ${"tempoh".$i."count"} = ${"tempoh".$i}->where('tempoh','>',12)->count(); + }else{ + ${"tempoh".$i."count"} = ${"tempoh".$i}->where([['tempoh','>',$i-1],['tempoh','<=',$i]])->count(); + } + ${"tempoh".$i."sum"} = ${"tempoh".$i}->sum('bakipjm'); + array_push($arraycount,${"tempoh".$i."count"}); + array_push($arraysum,${"tempoh".$i."sum"}); + } + + array_push($arraycount,$countaudit); + array_push($arraysum,$sumaudit); + + $arrayall = ['count' => $arraycount,'sum' => $arraysum]; + + return response()->json($arrayall,200); } -} \ No newline at end of file +}