fix kelulusan

app/Http/Controllers/KhazanahController.php

@@ -211,7 +211,7 @@ class KhazanahController extends Controller
        $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan_barcode])->json();
        //dd($tebus);
        $tebus_detail = $tebus[0];
-       //dd($tebus_detail);
+       
        
        $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
 
@@ -227,18 +227,22 @@ class KhazanahController extends Controller
 
        if($tebus_detail['jenistebus'] == 'P')
        {
+             
             $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
+            $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
 
-            // dd($tebus_detail['addpinjaman'],$keluar,$totalkeluar);
-            $bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
+            $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
 
+            
             $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                 'kodlaluan' => $tebus_detail['teller'],   
                 'keluar'=>$totalkeluar,
-                'masuk'=>$masuk,
+                'masuk'=>$totalmasuk,
                 'bakiakhir'=>$bakiakhir
             ]);
 
+            
+
        }else{
 
             $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
@@ -532,10 +536,9 @@ class KhazanahController extends Controller
 
                 if($request->pembatalan == null)
                 {
-
                     $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                         "pengesahan" => "operasi",
-                        'siri' => $request->siri
+                        'siri' => $request->siri,
                     ])->json();
 
                 }else{