diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 827e3f9..7a61102 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3253,6 +3253,26 @@ class GadaiController extends Controller return response()->json($arrayrekod,200); } + public function LaporanAuditTakAktifCombine($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $audit = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',1],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); + + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); + + $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; + + return response()->json($arrayrekod,200); + } + public function kiraupahTawarruqStokAudit($tempoh,$tempohbayar,$kadarupah,$bakipinjaman){ $bilang_bln = $tempoh - $tempohbayar; diff --git a/routes/web.php b/routes/web.php index b85e395..0bda77a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -279,6 +279,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); + $router->get('stokaudit/takaktifcombine/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktifCombine']); + $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']); $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);