diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 2367aad..3a8ccfb 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -483,7 +483,7 @@ class LelongController extends Controller
 
 
        $serahbaki = SerahBaki::on($cawangan['mysql'])
-            ->where('tarikh','<=', $request->tarikh)
+            ->where([['tarikh','<=', $request->tarikh],['aktif',1]])
             ->sum('baki');
 
         return response()->json($serahbaki,200);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index bde2a80..1568d0d 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -22,6 +22,20 @@ use App\Moratorium;
 use App\Audit;
 use App\LookupWakil;
 
+use App\StokAudit1;
+use App\StokAudit2;
+use App\StokAudit3;
+use App\StokAudit4;
+use App\StokAudit5;
+use App\StokAudit6;
+use App\StokAudit7;
+use App\StokAudit8;
+use App\StokAudit9;
+use App\StokAudit10;
+use App\StokAudit11;
+use App\StokAudit12;
+
+
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
@@ -1907,4 +1921,56 @@ class TebusController extends Controller
             return response(0);
     }
 
+    public function calculationKeuntunganPenggadai($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $date = new Carbon($request->tarikh);
+        $month_sebelum = $date->subMonth()->format('m');
+        $month_sekarang = $date->format('m');
+        $year_generate = $date->format('Y');
+
+        switch($month_sebelum){
+            case '01': $audit_backdate = StokAudit1::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '02': $audit_backdate = StokAudit2::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '03': $audit_backdate = StokAudit3::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '04': $audit_backdate = StokAudit4::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '05': $audit_backdate = StokAudit5::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '06': $audit_backdate = StokAudit6::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '07': $audit_backdate = StokAudit7::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '08': $audit_backdate = StokAudit8::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '09': $audit_backdate = StokAudit9::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '10': $audit_backdate = StokAudit10::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '11': $audit_backdate = StokAudit11::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;
+            case '12': $audit_backdate = StokAudit12::on($cawangan['mysql'])->where('tahun',$year_generate);
+                        break;                               
+        }
+
+
+        $audit_now = Gadai::on($cawangan['mysql'])
+            ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->orderBy('t_gadai', 'ASC')
+            ->orderBy('sirig', 'ASC');
+
+        $totaltunggakan_now = $audit_now->sum('tunggakan');
+        $totaltunggakan_sebelum = $audit_backdate->sum('upahblmbyar');
+
+        
+        dd($totaltunggakan_now,$totaltunggakan_sebelum);
+
+
+    }
+
 }
diff --git a/routes/web.php b/routes/web.php
index 6904512..be1d82b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -477,6 +477,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']);
     $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']);
     $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']);
+    $router->get('KeuntunganPenggadai/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganPenggadai']);
 
 
     //LEJER AM//