diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 18c7541..8c91293 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -1434,7 +1434,7 @@ class AliranTunaiController extends Controller
         $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
 
         $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
-        $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+        $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
 
         $totalserahan = 0;
         $totalpendahuluan = 0;
@@ -1452,15 +1452,26 @@ class AliranTunaiController extends Controller
         }
 
         $totalgadai = 0;
+        $totalgadaibarcodescanned = 0;
         foreach($gadai as $index1=>$gad)
         {
-            $totalgadai += $gad['pinjaman'];
+            if($gad['semakbarcode'] === 'LULUS')
+                $totalgadai += $gad['pinjaman'];
         }
 
         $totaltebus = 0;
+        $totalgadaibarcodescanned = 0;
+
         foreach($tebus as $index1=>$teb)
         {
-            $totaltebus += $teb['bakipjm'];
+            if($teb['tagterima'] === 1){
+                if($teb['jenistebus'] === 'S')
+                {
+                    $totaltebus += $teb['pinjaman'] + $teb['bakiupah'];
+                }else{
+                    $totaltebus += $teb['bakipjm'];
+                }
+            }
         }
 
         $totalansuran = 0;
@@ -1472,7 +1483,7 @@ class AliranTunaiController extends Controller
         $totalupahlama = 0;
         foreach($advansur as $index1=>$upahlama)
         {
-            $totalupahlama += $upahlama['upahDiBayar'];
+            $totalupahlama += $upahlama['upahDibayar'];
         }
 
         $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
@@ -1497,7 +1508,7 @@ class AliranTunaiController extends Controller
         if(number_format($gadaian,2) != number_format($keluar,2))
             $errorgadaian = true;
         
-        if($errorpendahuluan === false && $errorserahan === false && $errorgadaian === false && $errorpenebusan === false && $errorbaki === false)
+        if($errorbaki === false)
         {
             return response('sama');
         }else{
@@ -1511,12 +1522,21 @@ class AliranTunaiController extends Controller
         $auth_user = Auth::user();
 
 
+        $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
+
+        $keluar = $alirantunai['keluar'];
+        $baki = $alirantunai['baki'];
+        $masuk = $alirantunai['masuk'];
+        $bakiawal = $alirantunai['bakiawal'];
+        $pendahuluan = $alirantunai['tambah'];
+        $serahan = $alirantunai['kurang'];
+
         $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                         'kodlaluan' => $auth_user['name'],   
-                        'keluar'=> $request->gadaian,
-                        'masuk'=> $request->penebusan,
+                        'keluar'=> $keluar,
+                        'masuk'=> $masuk,
                         'bakiakhir'=> $request->bakiakhir
-                    ]);
+        ]);
 
         if($updateTunai->status() == 200)
         {