diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8c9bbe1..b2fb08e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -238,18 +238,19 @@ class LelongController extends Controller $tarikhbaru = $request->mula; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $bakilelong = Lelong::on($cawangan['mysql']) - ->where('trkhtuntut','>=',$request->mula) - ->where('trkhtuntut','<=',$request->hingga) - ->where('baki','>=',0) - ->sum('baki'); + + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('trkhtuntut','>=',$request->mula) + ->where('trkhtuntut','<=',$request->hingga) + ->where('baki','>=',0) + ->sum('baki'); $rugilelong = Lelong::on($cawangan['mysql']) ->where('trkhtuntut','>=',$request->mula) ->where('trkhtuntut','<=',$request->hingga) ->where('baki','<',0) ->sum('baki'); - + $rugitotal = $rugilelong; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 4c5e809..d066b36 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -164,6 +164,8 @@ class TebusController extends Controller public function getMoratorium(){ $bln_mora = Moratorium::first(); + + return response()->json($bln_mora); } public function updateMoratorium(Request $request){ diff --git a/routes/web.php b/routes/web.php index 8b97767..0804f6f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -102,6 +102,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']); $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); + $router->get('moratorium/details',['uses'=>'TebusController@getMoratorium']); + //Maintenance API TEBUS // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);