diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f7f50f5..dea0e97 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1430,6 +1430,7 @@ class GadaiController extends Controller
         $bakiakhir = 0;
         $totalkeluar = 0;
 
+
         if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
         {
 
@@ -1437,10 +1438,11 @@ class GadaiController extends Controller
             {
                 if($tebus['jenistebus'] == 'P')
                 {
+
                      $totalkeluar = $keluar - $tebus['addpinjaman'];
                      $totalmasuk = $masuk - $tebus['bakiupah'];
          
-                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1448,12 +1450,15 @@ class GadaiController extends Controller
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
+                    
          
                 }else{
          
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
-                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+
+                    //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1461,6 +1466,7 @@ class GadaiController extends Controller
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
+
                 }
             }else{
 
@@ -1468,7 +1474,7 @@ class GadaiController extends Controller
 
                 if($tebus['jenistebus'] == 'P')
                 {
-           
+
                     $bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
         
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
@@ -1497,6 +1503,10 @@ class GadaiController extends Controller
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+            TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
+            
+            Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
     
             Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
 
@@ -1537,9 +1547,9 @@ class GadaiController extends Controller
                 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-    
+            // TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            // Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
             
-
             return response('Deleted Successfully', 200);
         }
        
@@ -1587,6 +1597,10 @@ class GadaiController extends Controller
                 Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
         
                 return response('Deleted Successfully', 200);
             }
@@ -1609,6 +1623,10 @@ class GadaiController extends Controller
                 Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
         
                 return response('Deleted Successfully', 200);
             }