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']); +