diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ab699ff..7538897 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -936,68 +936,39 @@ class GadaiController extends Controller
 
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',1)
-                // ->where('nilaimarhun','<=',400.99)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [1, 400.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();       
-        
-        
 
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',401)
-                // ->where('nilaimarhun','<=',2000.99)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [401, 2000.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get(); 
                 
         $gadai3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',2001)
-                // ->where('nilaimarhun','<=',100000)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [2001, 100000])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',1)
-                ->where('nilaimarhun','<=',400.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
-                ->get();                
+                ->whereBetween('nilaimarhun', [1, 400.99])
+                ->get();  
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
-                ->get();     
+                ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->get();  
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
+                ->whereBetween('nilaimarhun', [2001, 100000])
                 ->get();  
                 
                 
@@ -1110,55 +1081,58 @@ class GadaiController extends Controller
                 ->where('nilaimarhun','<=',100000)
                 ->get();   
 
-        foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+        if($kodcaw == 'KB2')
         {
-            //Gadai 
-            $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
-            $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
-            $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
-            $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
-            $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
-            $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
+            foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+            {
+                //Gadai 
+                $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
+                $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
+                $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
+                $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
+                $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
+                $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
 
-            $gadai1[0]['bil'] = $gad1;
-            $gadai1[0]['pinj'] = $gadpinj1;
-            $gadai2[0]['bil'] = $gad2;
-            $gadai2[0]['pinj'] = $gadpinj2;
-            $gadai3[0]['bil'] = $gad3;
-            $gadai3[0]['pinj'] = $gadpinj3;
+                $gadai1[0]['bil'] = $gad1;
+                $gadai1[0]['pinj'] = $gadpinj1;
+                $gadai2[0]['bil'] = $gad2;
+                $gadai2[0]['pinj'] = $gadpinj2;
+                $gadai3[0]['bil'] = $gad3;
+                $gadai3[0]['pinj'] = $gadpinj3;
 
-            //Tebus
+                //Tebus
 
-            $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
-            $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
-            $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
-            $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
-            $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
-            $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
+                $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
+                $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
+                $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
+                $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
+                $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
+                $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
 
-            $tebus1[0]['bil'] = $teb1;
-            $tebus1[0]['pinj'] = $tebpinj1;
-            $tebus2[0]['bil'] = $teb2;
-            $tebus2[0]['pinj'] = $tebpinj2;
-            $tebus3[0]['bil'] = $teb3;
-            $tebus3[0]['pinj'] = $tebpinj3;
+                $tebus1[0]['bil'] = $teb1;
+                $tebus1[0]['pinj'] = $tebpinj1;
+                $tebus2[0]['bil'] = $teb2;
+                $tebus2[0]['pinj'] = $tebpinj2;
+                $tebus3[0]['bil'] = $teb3;
+                $tebus3[0]['pinj'] = $tebpinj3;
 
-            //Lelong
+                //Lelong
 
-            $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
-            $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
-            $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
-            $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
-            $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
-            $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
+                $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
+                $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
+                $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
+                $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
+                $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
+                $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
 
-            $lelong1[0]['bil'] = $lel1;
-            $lelong1[0]['pinj'] = $lelpinj1;
-            $lelong2[0]['bil'] = $lel2;
-            $lelong2[0]['pinj'] = $lelpinj2;
-            $lelong3[0]['bil'] = $lel3;
-            $lelong3[0]['pinj'] = $lelpinj3;
+                $lelong1[0]['bil'] = $lel1;
+                $lelong1[0]['pinj'] = $lelpinj1;
+                $lelong2[0]['bil'] = $lel2;
+                $lelong2[0]['pinj'] = $lelpinj2;
+                $lelong3[0]['bil'] = $lel3;
+                $lelong3[0]['pinj'] = $lelpinj3;
 
+            }
         }
 
         //////////////////
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 8304536..08843cc 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -38,6 +38,20 @@ class PanjarController extends Controller
       return response()->json($panjar);
    }
 
+   public function listeachpanjar(Request $request,$kodcaw)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $panjar=Panjar::on($cawangan['mysql'])
+               ->where('nobaucer','=',$request->nobaucer)
+               ->first();
+
+      return response()->json($panjar);
+   }
+
    public function listmulaakhir($kodcaw,$mula,$akhir)
    {
    
diff --git a/routes/web.php b/routes/web.php
index e7bcbbb..49aa4c9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -235,6 +235,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
     $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']);
+    $router->get('SenaraiPanjar/listeach/{kodcaw}',['uses'=>'PanjarController@listeachpanjar']);
     $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
     // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
     $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);