From 428a41dae1883ceecbf0f67c2ab291f35f6e5c62 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 31 Jan 2021 08:33:26 +0800 Subject: [PATCH] masuk aging --- app/Http/Controllers/GadaiController.php | 29 ++++++++++++++++++++ app/Http/Controllers/KelulusanController.php | 3 ++ app/Http/Controllers/TunaiController.php | 19 +++++++++++++ routes/web.php | 8 ++++-- 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 6a8e6f5..ebc338f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1468,6 +1468,7 @@ class GadaiController extends Controller } public function statistikGadaian(){ + $current = Carbon::now(); $current = new Carbon(); @@ -1485,4 +1486,32 @@ class GadaiController extends Controller return response()->json($array_total); } + + public function carian_AgingBulanan($kodcaw,$tarikh,$num) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $db=$cawangan['mysql']; + + $gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)=".$num.") and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."'and t_gadai<='".$tarikh."'))"); + return response()->json($gadai_aging); + } + + public function carian_agingLebih12_Bulan($kodcaw,$tarikh) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $db=$cawangan['mysql']; + $gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(DATE_FORMAT('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)>'12') and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))"); + return response()->json($gadai_aging); + } + + public function carian_Seluruh_AgingBulanan($kodcaw,$tarikh) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $db=$cawangan['mysql']; + + $gadai_aging=DB::connection($db)->select("SELECT kodcaw,count(norujukan) as a,sum(pinjaman)as b,((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1) AS bln From gadai where ((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))"); + return response()->json($gadai_aging); + } } diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 04fd5dc..266bb45 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -57,6 +57,9 @@ class KelulusanController extends Controller $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','<',$harini->toDateString()) + ->where('pelulus','=','khazanah') + ->where('peloperasi','=','') + ->where('masalulus','<>','') ->get(); return response()->json($kelulusan); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 9a62a2f..47bbdd2 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -81,6 +81,25 @@ class TunaiController extends Controller } + public function UpdateTunaiGadaianTebus($kodcaw, $kodlaluan, Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])-> + update(array( + 'keluar'=>$request->keluar, + 'masuk'=>$request->masuk, + 'baki'=>$request->bakiakhir + )); + + return response()->json($updatetunai, 200); + + + } + diff --git a/routes/web.php b/routes/web.php index 3498c0f..10bec55 100644 --- a/routes/web.php +++ b/routes/web.php @@ -171,7 +171,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ //LAPORAN API $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan - + $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']); + $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']); + $router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']); //API BARU $router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']); @@ -182,6 +184,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']); $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']); $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']); + $router->put('updateTunaiGT/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunaiGadaianTebus']); $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']); $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']); $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']); @@ -205,6 +208,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API KELULUSAN $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); + $router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']); $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']); $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']); $router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']); @@ -214,8 +218,6 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']); $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']); - - //API REQUEST TELLER $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);