diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ab65291..d43c568 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -243,6 +243,7 @@ class KhazanahController extends Controller $jenis_tebus=$tebus[0]['jenistebus']; $bakipjm=$tebus[0]['bakipjm']; $bakiupah=$tebus[0]['bakiupah']; + $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json(); @@ -294,12 +295,12 @@ class KhazanahController extends Controller if($jenis_tebus=='T') { - $kredit_Pinjaman=$kredit_Pinjaman+$bakipjm; + $kredit_Pinjaman=$kredit_Pinjaman+$pinjaman; } else { - $debit_Pinjaman=$debit_Pinjaman+$bakipjm; + $debit_Pinjaman=$debit_Pinjaman+$pinjaman; } $hariIni_Pinjaman=$debit_Pinjaman-$kredit_Pinjaman; @@ -330,7 +331,7 @@ class KhazanahController extends Controller if($jenis_tebus='T') { - $debit_Tunai=$debit_Tunai+$bakipjm+$bayaran_latest_untung; + $debit_Tunai=$debit_Tunai+$bakipjm; } else diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index eadf530..ef3b821 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -134,7 +134,7 @@ class PenebusanController extends Controller 'debit'=>$debit_Tunai, 'kredit'=>$kredit_Tunai, 'hariini'=>$hariIni_Tunai, - 'kelmarin'=>$kelmarin_Tunai, + 'kelmarin'=>$kelmarin_Tunai, ]); $get_lejerUT=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_UT])->json();