From 65931b6c771a9f67318599ae029febbc2d5a04af Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 12 Aug 2021 23:43:34 +0800 Subject: [PATCH] fix skit2 --- app/Http/Controllers/TebusController.php | 32 +++++++++++++++++++++++- app/Http/Controllers/TunaiController.php | 14 +++++++++++ config/database.php | 8 ++++++ routes/web.php | 3 +++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 12c0f76..e08ce36 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1041,7 +1041,6 @@ class TebusController extends Controller $penghutangkaki = imbangdugalama::on($cawangan['mysql']) ->sum('penghutang'); - return response()->json($penghutangkaki,200); } @@ -1211,4 +1210,35 @@ class TebusController extends Controller return response($rebet); } + public function getUpahLamaToday($kodcaw,$norujukan) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->where('tarikh','=',$current->toDateString()) + ->orderBy('tarikh','desc') + ->get(); + + if(sizeof($listadvansur) > 0) + return response(1); + else + return response(0); + } + + public function removeUpahLamaToday($kodcaw,$norujukan) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $removed = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + + if($removed) + return response(1); + else + return response(0); + } + } diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index b4f9725..ded94ed 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -272,6 +272,20 @@ class TunaiController extends Controller return response()->json($requestteller); } + public function getRequestTellerLaporanSerahanBerkala($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $requestteller=RequestTeller::on('mysql7') + ->where([['kodcaw','=',$kodcaw],['update','=',1],['serahan','>',0],['kodlaluan','=',$request->teller],['tarikh','=',$current->toDateString()]]) + ->orderBy('recno','desc') + ->first(); + + return response()->json($requestteller); + } + public function getRequestTellerByDate($kodcaw,Request $request) { diff --git a/config/database.php b/config/database.php index da7a044..eebc494 100644 --- a/config/database.php +++ b/config/database.php @@ -16,6 +16,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql2' => [ 'driver' => 'mysql', @@ -28,6 +29,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql3' => [ 'driver' => 'mysql', @@ -40,6 +42,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql4' => [ 'driver' => 'mysql', @@ -52,6 +55,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql5' => [ 'driver' => 'mysql', @@ -64,6 +68,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -78,6 +83,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -92,6 +98,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql8' => [ 'driver' => 'mysql', @@ -104,6 +111,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql9' => [ diff --git a/routes/web.php b/routes/web.php index eccfa04..15c0016 100644 --- a/routes/web.php +++ b/routes/web.php @@ -216,6 +216,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']); $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']); + $router->get('upahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@getUpahLamaToday']); + $router->post('removeupahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@removeUpahLamaToday']); //POLIS API $router->get('polis/get/',['uses'=>'PolisController@getPolis']); @@ -296,6 +298,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); $router->get('requestTeller/getlaporan/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahan']); + $router->get('requestTeller/getlaporanberkala/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahanBerkala']); $router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']); $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);