diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 47069f9..6420976 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -295,12 +295,13 @@ class KhazanahController extends Controller if($jenis_tebus=='T') { - + $kredit_Pinjaman=$kredit_Pinjaman+$pinjaman; + } else { - $debit_Pinjaman=$debit_Pinjaman+$pinjaman; + } $hariIni_Pinjaman=$debit_Pinjaman-$kredit_Pinjaman; diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index ef3b821..28765ca 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -136,7 +136,36 @@ class PenebusanController extends Controller 'hariini'=>$hariIni_Tunai, 'kelmarin'=>$kelmarin_Tunai, - ]); + ]); + + + + $get_Pinj=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_PINJAMAN])->json(); + + $hariini_Pinj=$get_Pinj[0]['hariini']; + $kelmarin_Pinj=$get_Pinj[0]['kelmarin']; + $jumlah_Pinj=$get_Pinj[0]['jumlah']; + $debit_Pinj=$get_Pinj[0]['debit']; + $recno_Pinj=$get_Pinj[0]['recno']; + $kredit_Pinj=$get_Pinj[0]['kredit']; + + $kredit_Pinj=$kredit_Pinj+$bakiPinjaman; + $debit_Pinj=$debit_Pinj+$bakiPinjaman; + + $hariini_Pinj=$debit_Pinj-$kredit_Pinj; + $kelmarin_Pinj=$jumlah_Pinj-$hariini_Pinj; + + + $updateGlejer_Pinj=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[ + 'recno'=>$recno_Pinj, + 'debit'=>$debit_Pinj, + 'kredit'=>$kredit_Pinj, + 'hariini'=>$hariini_Pinj, + 'kelmarin' =>$kelmarin_Pinj, + + ]); + + $get_lejerUT=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_UT])->json(); $hariini_UT=$get_lejerUT[0]['hariini']; @@ -239,6 +268,33 @@ class PenebusanController extends Controller ]); + + + $get_Pinj=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_PINJAMAN])->json(); + + $hariini_Pinj=$get_Pinj[0]['hariini']; + $kelmarin_Pinj=$get_Pinj[0]['kelmarin']; + $jumlah_Pinj=$get_Pinj[0]['jumlah']; + $debit_Pinj=$get_Pinj[0]['debit']; + $recno_Pinj=$get_Pinj[0]['recno']; + $kredit_Pinj=$get_Pinj[0]['kredit']; + + + $kredit_Pinj=$kredit_Pinj+$bakiPinjaman; + $debit_Pinj=$debit_Pinj+$bakiPinjaman; + $hariini_Pinj=$debit_Pinj-$kredit_Pinj; + $kelmarin_Pinj=$jumlah_Pinj-$hariini_Pinj; + + $updateGlejer_Pinj=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[ + 'recno'=>$recno_Pinj, + 'debit'=>$debit_Pinj, + 'kredit'=>$kredit_Pinj, + 'hariini'=>$hariini_Pinj, + 'kelmarin' =>$kelmarin_Pinj, + + ]); + + $get_lejerUT=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_UT])->json(); $hariini_UT=$get_lejerUT[0]['hariini'];