diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 3bb56ad..c27bb84 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2047,7 +2047,7 @@ class GadaiController extends Controller
         ->sum('upah12');
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-        ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
         // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
         ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
         ->whereYear('tarikh_bayaran','=',$current->year)
@@ -2076,7 +2076,7 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('tarikh_bayaran' ,'<=', $daterequest)
@@ -2085,4 +2085,64 @@ class GadaiController extends Controller
         return response($transaksi);
     }
 
+    public function LaporanAuditAktif($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekodaudit = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->get();
+
+        $totalrekod = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('pinjaman');
+
+        $totalberat = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('berat');
+
+        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('nilaimarhun');
+
+        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
+
+        return response()->json($arrayrekod,200);
+    }
+
+    public function LaporanAuditTakAktif($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+
+        $arrayrekodemaspalsu = [];
+
+        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->get();
+
+
+        dd($rekod_emaspalsu);
+
+        $total = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->sum('pinjaman');
+
+        array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]);
+
+        dd($arrayrekodemaspalsu);
+        return response()->json();
+    }
+
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 103a082..ce032e6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -576,7 +576,7 @@ class TebusController extends Controller
 
         //Keuntungan Selepas Tawarruq
         $keuntungan = TransaksiKeuntungan::on('mysql7')
-            ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
             ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
             ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
             ->whereNull('db2.hargajualan')
@@ -737,7 +737,7 @@ class TebusController extends Controller
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
                     ->whereYear('tarikh_bayaran','=',$current->year)
@@ -752,7 +752,7 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rebet = Tebus::on($cawangan['mysql'])
-                ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
+                ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
                 ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
                 ->whereNotNull('db2.hargajualan')
diff --git a/routes/web.php b/routes/web.php
index 081e3ae..b223bdc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -190,6 +190,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
+    $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif
+    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan stokaudit Tak Aktif
     $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
     $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
     $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);