Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter into pipiv2

app/Http/Controllers/KhazanahController.php

@@ -241,6 +241,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();
@@ -292,12 +293,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;
@@ -328,7 +329,7 @@ class KhazanahController extends Controller
             if($jenis_tebus='T')
             {
 
-             $debit_Tunai=$debit_Tunai+$bakipjm+$bayaran_latest_untung;
+             $debit_Tunai=$debit_Tunai+$bakipjm;
 
             }
              else

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();