diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 02c9d08..8c413b4 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -887,13 +887,20 @@ class GadaiController extends Controller
         return response()->json($array_harian);
     }
 
-    public function getLaporanAnsuran($kodcaw,$tarikh){
+    public function getLaporanAnsuran($kodcaw,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $gadai = Tebus::on($cawangan['mysql'])
-                ->where('jenistebus','=',"A")
-                ->where('t_tebus','=',$tarikh)
-                ->orderBy('t_tebus')
+        $dateans = new Carbon($request->tarikh);
+        $dateans->addDays(1);
+
+        $date = new Carbon($request->tarikh);
+
+
+        $gadai = Transaction::on('mysql7')
+                ->join('transaksi_keuntungan', 'transaction.norujukan', '=', 'transaksi_keuntungan.norujukan')
+                ->where('transaction.trans_type','=','A')
+                ->where('transaction.created_at','>=',$date)
+                ->where('transaction.created_at','<=',$dateans)
                 ->get();
         
         return response()->json($gadai);
@@ -922,21 +929,21 @@ class GadaiController extends Controller
         ///////////
 
         $gadai1 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
+                // ->where([['t_gadai','<=',$tarikh],['sttebus','=','']])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<=',$tarikh]])
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $gadai3 = Gadai::on($cawangan['mysql'])
@@ -945,35 +952,31 @@ class GadaiController extends Controller
                 // ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
                 
         
@@ -987,7 +990,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $tebus2 = Gadai::on($cawangan['mysql'])
@@ -996,7 +998,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $tebus3 = Gadai::on($cawangan['mysql'])
@@ -1005,7 +1006,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
         $tebusini1 = Gadai::on($cawangan['mysql'])
@@ -1014,7 +1014,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $tebusini2 = Gadai::on($cawangan['mysql'])
@@ -1023,7 +1022,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $tebusini3 = Gadai::on($cawangan['mysql'])
@@ -1032,7 +1030,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
 
@@ -1047,7 +1044,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $lelong2 = Gadai::on($cawangan['mysql'])
@@ -1056,7 +1052,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $lelong3 = Gadai::on($cawangan['mysql'])
@@ -1065,7 +1060,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
         $lelongini1 = Gadai::on($cawangan['mysql'])
@@ -1074,7 +1068,6 @@ class GadaiController extends Controller
             ->where('sttebus','=','L')
             ->where('nilaimarhun','>=',1)
             ->where('nilaimarhun','<=',400.99)
-            ->orderBy('t_gadai')
             ->get();                
 
         $lelongini2 = Gadai::on($cawangan['mysql'])
@@ -1083,7 +1076,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $lelongini3 = Gadai::on($cawangan['mysql'])
@@ -1092,7 +1084,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();   
 
         //////////////////
@@ -1100,13 +1091,6 @@ class GadaiController extends Controller
         //////////////////
 
 
-
-                // $hapuskira = HapusKira::on($cawangan['mysql'])
-                // ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
-                // ->where('hapuskira.Tarikh','=',$tarikh)
-                // ->rightJoin('gadai', 'gadai.norujukan', '=', 'hapuskira.norujukan')
-                // ->get();
-
         $hapuskira1 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
                 ->where('tarikh','<',$tarikh)
diff --git a/routes/web.php b/routes/web.php
index 83f43c0..e7bcbbb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -183,7 +183,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     
 
     //ANSURAN UPAH API
-    $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+    $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
     $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
     $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);