From a30747913194c34c89ec325dda84a4ee882aeeb1 Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Tue, 9 Jan 2024 10:34:31 +0800 Subject: [PATCH 1/5] update sorting laporan scanbarcode --- app/Http/Controllers/GadaiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 51b9ca0..827e3f9 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -478,7 +478,7 @@ class GadaiController extends Controller ['cetak','=',1],['tagserah','=',1], ['semakbarcode','=','Lulus'] ]) - ->orderBy('norujukan','asc') + ->orderBy('sirig','asc') ->get(); return response()->json($gadai); From 6486935ee70e44338b089441fe9c858df97b3150 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 9 Jan 2024 15:06:12 +0800 Subject: [PATCH 2/5] update code untuk kemaskini data --- app/Http/Controllers/CallCenterController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php index 1ba737c..85b0804 100644 --- a/app/Http/Controllers/CallCenterController.php +++ b/app/Http/Controllers/CallCenterController.php @@ -583,7 +583,9 @@ class CallCenterController extends Controller $notis = CawanganNotis::on('mysql7') ->join('arrahn_master_db', 'arrahn_master_db.kodcaw', '=', 'cawangan_notis.kodcaw') - ->where('notis_id',$notisid)->get(); + ->where('notis_id',$notisid) + ->where('cawangan_notis.kodcaw','=', $kodcaw) + ->get(); foreach ($notis as $index => $cawangan){ $notisbycaw = NotisPeringatan::on('mysql7') From 72ce6306646a890d6fc980f233777bde2537ab6d Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 9 Jan 2024 16:10:33 +0800 Subject: [PATCH 3/5] update untuk kemaskini data arcc --- app/Http/Controllers/CallCenterController.php | 17 +++++++++++++++++ routes/web.php | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php index 85b0804..4b9fbd3 100644 --- a/app/Http/Controllers/CallCenterController.php +++ b/app/Http/Controllers/CallCenterController.php @@ -969,4 +969,21 @@ class CallCenterController extends Controller } } + public function getcawnotiskemaskini($notisid) + { + $current = Carbon::now(); + $current = new Carbon(); + + $arraybatch = []; + $batchnotis = Notis::on('mysql7')->where('id',$notisid)->get(); + $cawangan_all = Cawangan::on('mysql7')->get(); + $cawnotis_all = []; + foreach ($batchnotis as $index => $cawangan){ + $notis = CawanganNotis::on('mysql7') + ->join('arrahn_master_db', 'arrahn_master_db.kodcaw', '=', 'cawangan_notis.kodcaw') + ->where('notis_id',$notisid)->get(); + } + return response()->json($notis); + } + } diff --git a/routes/web.php b/routes/web.php index 012dc21..b30a9e8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -612,6 +612,12 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('rekodblast/{kodcaw}',['uses'=>'StokAuditController@rekodblast']); $router->get('rekodblastsms/{kodcaw}',['uses'=>'StokAuditController@rekodblastsms']); + //API notis peringatan cawangan + $router->get('/cawangan/getcawnotis/{kodcaw}/{notisid}',['uses'=>'CawanganCallCenterController@getcawnotis']); + $router->get('/cawangan/senarainotisperingatan/{kodcaw}',['uses'=>'CawanganCallCenterController@senarainotisperingatan']); + $router->get('/cawangan/getcawnotisall/{kodcaw}',['uses'=>'CawanganCallCenterController@getcawnotisall']); + + }); @@ -863,7 +869,7 @@ $router->group(['prefix'=>'arcc'], function () use ($router){ $router->get('getfasa',['uses'=>'CallCenterController@getfasa']); $router->get('getdatanotiskedua/{kodcaw}/{notisid}/{fasa}',['uses'=>'CallCenterController@getdatanotiskedua']); $router->post('/notis/blastwasapbysagkedua',['uses'=>'CallCenterController@blastwasapbysagkedua']); - + $router->get('getcawnotiskemaskini/{notisid}',['uses'=>'CallCenterController@getcawnotiskemaskini']); }); From c9e5735dacee2567a90bfa4aede26bbf028d1907 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 9 Jan 2024 16:53:21 +0800 Subject: [PATCH 4/5] update sikit --- app/Http/Controllers/CallCenterController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php index 4b9fbd3..499f325 100644 --- a/app/Http/Controllers/CallCenterController.php +++ b/app/Http/Controllers/CallCenterController.php @@ -256,7 +256,7 @@ class CallCenterController extends Controller $notisbycaw = NotisPeringatan::on('mysql7') ->where('notisperingatan.notis_id',$notisid) ->where('notisperingatan.kodcaw',$cawangan['kodcaw']) - ->where('notisperingatan.tarikhnotis1','=', NULL) + ->where('notisperingatan.peringatan','=', 1) ->distinct() ->get(); // dd($notisbycaw); @@ -278,7 +278,7 @@ class CallCenterController extends Controller $notisbycaw = NotisPeringatan::on('mysql7') ->where('notisperingatan.notis_id',$notisid) ->where('notisperingatan.kodcaw',$kodcaw) - ->where('notisperingatan.tarikhnotis1', '=', NULL) + ->where('notisperingatan.peringatan', '=', 1) ->distinct() ->get(); From 3f6315ae59a86d41556ba591be1bd21a6344d787 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 10 Jan 2024 09:14:50 +0800 Subject: [PATCH 5/5] update blast wasap notis kedua --- app/Http/Controllers/CallCenterController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php index 499f325..8d99200 100644 --- a/app/Http/Controllers/CallCenterController.php +++ b/app/Http/Controllers/CallCenterController.php @@ -916,9 +916,10 @@ class CallCenterController extends Controller ->where('notisperingatan.peringatan',2) ->where('notisperingatan.tarikhnotis2','=', NULL) ->distinct() - ->get()->toArray(); + ->get(); + $notisbycawarray = $notisbycaw->toArray(); // dd($notisbycaw); - if(empty($notisbycaw)){ + if(empty($notisbycawarray)){ // dd(false); return response()->json('failed'); }else{