From 40de6e8ff19212595bc431d49510b8d99c8e3e22 Mon Sep 17 00:00:00 2001 From: nurulnisha Date: Mon, 24 Jun 2024 11:44:14 +0800 Subject: [PATCH 1/2] fix marginpinj --- app/Http/Controllers/MarhunController.php | 10 ++++++++++ routes/web.php | 2 ++ 2 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7faa358..8c8a7b7 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -246,4 +246,14 @@ class MarhunController extends Controller return response()->json($totalnilaimarhun); } + + public function getMarhunCaw($kodcaw,$norujukan) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $data = Marhun::on($cawangan['mysql']) + ->where('norujukan','=', $norujukan) + ->sum('marhun.n_marhun'); + return response()->json($data,200); + + } } diff --git a/routes/web.php b/routes/web.php index 2bbe462..2c924e0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -178,6 +178,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('marhunterkumpul/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunTerkumpul']); $router->get('marhun/mutu/sag',['uses'=>'MarhunController@getMutuMarhun']); $router->get('marhun/nilai/terkini',['uses'=>'MarhunController@getNilaiMarhunLatest']); + //new added 230624 + $router->get('marhun/gadai/{kodcaw}/{norujukan}',['uses'=>'MarhunController@getMarhunCaw']); $router->get('jemas',['uses'=>'MarhunController@getAllJemas']); From 4ac12dc6d3a91f0fab3df2b47c149f0e7aae25d9 Mon Sep 17 00:00:00 2001 From: nurulnisha Date: Wed, 3 Jul 2024 11:12:26 +0800 Subject: [PATCH 2/2] add api-v2 --- app/Http/Controllers/GadaiController.php | 38 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index e00ed96..154e086 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -349,22 +349,34 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + // $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); - Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + // Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + // Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - $audit = new Audit(); - $audit->users = $request->teller; - $audit->actions = $request->transaction; - $audit->norujukan = $norujukan; - $audit->old_data = $old_data; - $audit->kodcaw = $request->kodcaw; - $audit->created_at = $current; - $audit->updated_at = $current; - $audit->save(); + // $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + $old_data = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->orWhere([['norujukan','=',$norujukan],['pinjaman','=',0.00]])->first(); + + + if($old_data){ + Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->delete(); + Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - return response('Batal Berjaya', 200); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = $request->transaction; + $audit->norujukan = $norujukan; + $audit->old_data = $old_data; + $audit->kodcaw = $request->kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + + //return response('Batal Berjaya', 200); + return response('Batal Berjaya', 200); + } else { + return response()->json('false'); + } } public function pembelianKomuditi($kodcaw,$norujukan){