diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index dac932e..849d915 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -812,7 +812,7 @@ class GadaiController extends Controller } } - return response()->json($gadaiToday); + return response()->json(number_format($gadaiToday,2)); } @@ -831,7 +831,7 @@ class GadaiController extends Controller } } } - return response()->json($tebusToday); + return response()->json(number_format($tebusToday,2)); } public function showAllVariasiToday(){ @@ -861,7 +861,7 @@ class GadaiController extends Controller } } $variasiToday = $gadaiToday - $tebusToday; - return response()->json($variasiToday); + return response()->json(number_format($variasiToday,2)); } public function showAllUpahToday(){ @@ -878,7 +878,24 @@ class GadaiController extends Controller } } } - return response()->json($upahToday); + return response()->json(number_format($upahToday,2)); + } + public function showAllGadaiTerkumpul() + { + $cawangan_all = Cawangan::on('mysql7')->get(); + + $gadaiTerkumpul = 0; + foreach($cawangan_all as $index=>$cawangan){ + $gadaiterkumpul = gadai::on($cawangan['mysql'])->where('sttebus','=','')->get(); + if(sizeof($gadaiterkumpul) != 0){ + $gadaicawangan=0; + foreach($gadaiterkumpul as $gadaiterkumpulall) + { + $gadaiTerkumpul += $gadaiterkumpulall['pinjaman']; + } + } + } + return response()->json(number_format($gadaiTerkumpul,2)); } public function showTebusTerkumpul(){ diff --git a/routes/web.php b/routes/web.php index 4019af2..cbf9d99 100644 --- a/routes/web.php +++ b/routes/web.php @@ -241,6 +241,7 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('jumlahTebus',['uses'=>'GadaiController@showAllTebusToday']); $router->get('jumlahUpah',['uses'=>'GadaiController@showAllUpahToday']); $router->get('jumlahVariasi',['uses'=>'GadaiController@showAllVariasiToday']); + $router->get('gadaiTerkumpul',['uses'=>'GadaiController@showAllGadaiTerkumpul']); $router->get('tebus/terkumpul',['uses'=>'GadaiController@showTebusTerkumpul']); $router->get('upah/terkumpul',['uses'=>'GadaiController@showUpahTerkumpul']);