diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 70285d0..1735b3d 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1439,7 +1439,8 @@ class GadaiController extends Controller
                      $totalkeluar = $keluar - $tebus['addpinjaman'];
                      $totalmasuk = $masuk - $tebus['bakiupah'];
          
-                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    $bakiakhir = $baki - $totalkeluar + $totalmasuk;
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1453,7 +1454,8 @@ class GadaiController extends Controller
          
                      $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;
+                    $bakiakhir = ($baki - $totalmasuk) + $totalkeluar;
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
@@ -1483,7 +1485,10 @@ class GadaiController extends Controller
 
                 }else{
 
-                    $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
+                     $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+
+                    $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar;
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1581,7 +1586,8 @@ class GadaiController extends Controller
             {
                 $totalmasuk = $masuk - $tebus[0]['bakipjm'];
 
-                $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                $bakiakhir = $baki - $totalmasuk;
 
                 $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                 update(array(