diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a1713c8..c6bb1ae 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -195,7 +195,7 @@ class AdminPageController extends Controller $tebus = Gadai::on($cawangan['mysql']) ->whereYear('t_update',$current->year) - ->where('sttebus','=','T') + ->where('sttebus','!=','') ->sum('pinjaman'); @@ -597,7 +597,7 @@ class AdminPageController extends Controller ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_update,'%Y%m')")) ->whereYear('t_update',$current->year) - ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) + ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) ->orderBy('t_update','asc') ->get(); @@ -1469,13 +1469,7 @@ class AdminPageController extends Controller public function DeleteBlackList(Request $request) { - - $customer = Customer::on('mysql7') - ->where('kpbaru','=', $request->nokp) - ->orWhere('kplama','=', $request->nokp) - ->first(); - - $blacklist = Blacklist::where('id',$id)->delete(); + $blacklist = Blacklist::where('id',$request->id)->delete(); return response()->json($blacklist, 201); } diff --git a/routes/web.php b/routes/web.php index b9d1210..f313ee0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -660,7 +660,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']); $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']); - $router->get('DeleteBlacklist/{kodcaw}',['uses'=>'AdminPageController@DeleteBlackList']); + $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);