diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2d2d716..5916d4f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -720,6 +720,44 @@ class GadaiController extends Controller return response()->json($gadai); } + public function getLaporanGadaiRangeDate($kodcaw,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp') + ->where('t_gadai','>=',$request->mula) + ->where('t_gadai','<=',$request->akhir) + ->orderBy('t_gadai') + ->orderBy('teller') + ->orderBy('sirig') + ->get(); + + $gadai = []; + + if($gadai_data){ + foreach($gadai_data as $index=>$gadaiData){ + $customer_info = Customer::on('mysql7')->where('kplama','=',$gadaiData['nokp'])->orWhere('kpbaru','=',$gadaiData['nokp'])->first(); + array_push($gadai,[ + "t_gadai"=> $gadaiData['t_gadai'], + "norujukan"=> $gadaiData['norujukan'], + "nama"=> $customer_info['nama'], + "nokp"=> $gadaiData['nokp'], + "semakbarcode"=> $gadaiData['semakbarcode'], + "masa"=> $gadaiData['masa'], + "berat"=> $gadaiData['berat'], + "nilaimarhun"=> $gadaiData['nilaimarhun'], + "pinjaman"=> $gadaiData['pinjaman'], + "upah12"=> $gadaiData['upah12'], + "percentpinj"=> $gadaiData['percentpinj'], + "alamat1"=> $customer_info['alamat1'], + "teller"=> $gadaiData['teller'] + ]); + } + } + + return response()->json($gadai); + } + public function getLaporanBatalGadai($kodcaw,$tarikh){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/routes/web.php b/routes/web.php index 4e7ec69..06748e4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,6 +89,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']); $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']); $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); + $router->get('gadailaporanRangeDate/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRangeDate']); $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']);