From 6045853f5283bd6aeef0c126e8a0750f77239ed2 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 28 Sep 2022 02:43:40 +0800 Subject: [PATCH] updated untuk push 28-9-2022 --- app/Http/Controllers/AdminPageController.php | 96 ++++++++++++++++++++ app/Http/Controllers/GadaiController.php | 15 ++- app/Http/Controllers/TebusController.php | 16 +++- app/Http/Controllers/TunaiController.php | 18 ++++ app/Http/Controllers/WTDController.php | 15 +++ routes/web.php | 17 ++-- 6 files changed, 162 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a6a5a33..08cf629 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -42,6 +42,7 @@ use App\StokAudit9; use App\StokAudit10; use App\StokAudit11; use App\StokAudit12; +use App\AuditCustomer; use DB; use Carbon\Carbon; @@ -2849,4 +2850,99 @@ class AdminPageController extends Controller return response()->json($arrayall,200); } + + + public function Laporan_SerahPetiBesiGadai(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $gadai = Gadai::on($cawangan['mysql']) + ->where([ + ['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga], + ['cetak','=',1],['tagserah','=',1]]) + ->orderBy('teller') + ->orderBy('semakbarcode') + ->get(); + + return response()->json($gadai); + } + + public function Laporan_SerahMarhunTebus(Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $gadai = Tebus::on($cawangan['mysql']) + ->where([ + ['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]]) + ->orderBy('teller') + ->orderBy('tagterima') + ->get(); + + return response()->json($gadai); + } + + public function laporanAuditCustomer(Request $request){ + + $audit_customer = AuditCustomer::on('mysql7') + ->where('kodcaw', $request->kodcaw) + ->whereDate('created_at','>=', $request->mula) + ->whereDate('created_at','<=', $request->hingga) + ->get() + ->toArray(); + + $array_audit_old = array(); + $array_audit_new = array(); + $array_changes_audit = array(); + + foreach($audit_customer as $index1=>$audit) + { + array_push($array_audit_old,json_decode($audit['old_data'], true)); + array_push($array_audit_new,json_decode($audit['new_data'], true)); + } + + foreach($array_audit_old as $index=>$old) + { + $test_old = array_diff($old[0],$array_audit_new[$index][0]); + $test_new = array_diff($array_audit_new[$index][0],$old[0]); + + if(sizeof($test_old) != 0) + { + array_push($array_changes_audit,['old' => $test_old,'new' => $test_new,'username' => $audit_customer[$index]['username'],'customer_name' => $audit_customer[$index]['customer_name'],'nokp' => $audit_customer[$index]['customer_nokp'],'tarikhmasa' => $audit_customer[$index]['created_at']]); + } + } + + return response()->json($array_changes_audit); + } + + public function ListBarcodeScannedOperasi(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $current = Carbon::now(); + + $gadai = Gadai::on($cawangan['mysql']) + ->where([ + ['sttebus','=',''], + ['semakbarcode','<>','Lulus'], + ]) + ->paginate(5); + + return response()->json($gadai,200); + } + + public function ListBarcodeScannedOperasi_Update(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $current = Carbon::now(); + + $gadai = Gadai::on($cawangan['mysql']) + ->where('norujukan',$request->norujukan) + ->update(['semakbarcode'=>'Lulus']); + + return response()->json($gadai); + } } diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index b315f9b..bd4e250 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -625,11 +625,18 @@ class GadaiController extends Controller if($dahscan){ return response()->json('scanned'); }else{ - $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update([ - 'semakbarcode'=>'Lulus' - ]); + $available_gadai = Gadai::on($cawangan['mysql'])->where('norujukan',$norujukan)->first(); - return response()->json('success'); + if($available_gadai) + { + $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update([ + 'semakbarcode'=>'Lulus' + ]); + + return response()->json('success'); + }else{ + return response()->json('unavailable'); + } } } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 4cffb9c..5eb2f4b 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -795,11 +795,17 @@ class TebusController extends Controller if($dahscan){ return response()->json('scanned'); }else{ - $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( - 'tagterima' => 1 - )); - - return response()->json('success'); + $available_tebus = Tebus::on($cawangan['mysql'])->where('norujukan',$norujukan)->first(); + if($available_tebus) + { + $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( + 'tagterima' => 1 + )); + + return response()->json('success'); + }else{ + return response()->json('unavailable'); + } } } diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 963fac6..6466592 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -621,6 +621,24 @@ class TunaiController extends Controller } } } + + public function CheckProsesReqTeller(Request $request){ + $current = new Carbon(); + $current = Carbon::now(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $requestteller=RequestTeller::on('mysql7') + ->where([ + ['kodcaw','=',$request->kodcaw], + ['kodlaluan','=',$request->kodlaluan], + ['update','=',0], + ['tarikh','=',$current->toDateString()] + ]) + ->get(); + + return response()->json($requestteller); + } } diff --git a/app/Http/Controllers/WTDController.php b/app/Http/Controllers/WTDController.php index e140e1f..fe12c2b 100644 --- a/app/Http/Controllers/WTDController.php +++ b/app/Http/Controllers/WTDController.php @@ -3,6 +3,8 @@ namespace App\Http\Controllers; use App\WTDDraft; +use App\TuntutBaki; +use App\Cawangan; use Illuminate\Http\Request; use Carbon\Carbon; @@ -19,4 +21,17 @@ class WTDController extends Controller return 'no'; } } + + public function getCustomerWTD(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + + $tuntutbaki = TuntutBaki::on($cawangan['mysql']) + ->select('teller') + ->where('norujukan',$request->norujukan) + ->get(); + + return response()->json($tuntutbaki); + } } diff --git a/routes/web.php b/routes/web.php index be1d82b..0aaf9bb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -344,7 +344,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $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']); - + $router->get('requestTeller/checkproses',['uses'=>'TunaiController@CheckProsesReqTeller']); + //API DENO PANJAR & DENO PEND-SERAHAN $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']); $router->get('getdenopanjar/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']); @@ -548,6 +549,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('initiate/tunai',['uses'=>'TunaiController@initiateTunai']); //WTD $router->get('check/wtd',['uses'=>'WTDController@getDraftWTD']); + $router->get('check/customer',['uses' => 'WTDController@getCustomerWTD']); $router->get('check/lelong/tawarruq',['uses'=>'GadaiController@updateLelongTawarruq']); $router->get('update/sttebus/gadaian',['uses'=>'GadaiController@updateTebusGadai']); @@ -721,13 +723,16 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('audit/keuntungansebenar',['uses'=>'AdminPageController@KeuntunganSebenarExport']); $router->get('laporan/aging',['uses'=>'AdminPageController@LaporanAging']); $router->get('dashboard/aging',['uses'=>'AdminPageController@DashboardAging']); - - - - - + $router->get('laporan/auditcustomer',['uses'=>'AdminPageController@laporanAuditCustomer']); + $router->get('test/keuntungansebenar',['uses'=>'AdminPageController@AkruKeuntunganSebenar']); + $router->get('test/pendapatanterakru',['uses'=>'TebusController@CalculationPendapatanTerakru']); + $router->get('laporan/serahgadai',['uses'=>'AdminPageController@Laporan_SerahPetiBesiGadai']); + $router->get('laporan/serahmarhuntebus',['uses'=>'AdminPageController@Laporan_SerahMarhunTebus']); + + $router->get('tetapan/listbarcode',['uses'=>'AdminPageController@ListBarcodeScannedOperasi']); + $router->put('tetapan/listbarcode/update',['uses'=>'AdminPageController@ListBarcodeScannedOperasi_Update']); });