diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php
index 1ba737c..8d99200 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();
 
@@ -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')
@@ -914,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{
@@ -967,4 +970,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/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);
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']);
 
 
 });