diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 1735b3d..3bb56ad 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1436,11 +1436,11 @@ class GadaiController extends Controller
                 if($tebus['jenistebus'] == 'P')
                 {
 
-                     $totalkeluar = $keluar - $tebus['addpinjaman'];
-                     $totalmasuk = $masuk - $tebus['bakiupah'];
+                     $totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
+                     $totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
          
                     //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
-                    $bakiakhir = $baki - $totalkeluar + $totalmasuk;
+                    $bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1455,7 +1455,9 @@ 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 = ($baki - $totalmasuk) + $totalkeluar;
+
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = $baki - $tebus['bakipjm'];
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
@@ -1486,9 +1488,10 @@ class GadaiController extends Controller
                 }else{
 
                     $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
-                     $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
 
-                    $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar;
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = ($bakiakhir - $tebus['bakipjm']);
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1587,7 +1590,7 @@ class GadaiController extends Controller
                 $totalmasuk = $masuk - $tebus[0]['bakipjm'];
 
                 // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
-                $bakiakhir = $baki - $totalmasuk;
+                $bakiakhir = $baki - $tebus[0]['bakipjm'];
 
                 $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                 update(array(