Merge branch 'pipi' into 'master'

fix aliran tunai

See merge request online-sistem1/kaunter!81

app/Http/Controllers/KhazanahController.php

@@ -230,10 +230,9 @@ class KhazanahController extends Controller
        {
              
             // $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
-            $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
+            $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
             // $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
 
-            
             $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                 'kodlaluan' => $tebus_detail['teller'],   
                 'keluar'=>$keluar,

resources/views/penebusan/index.blade.php

@@ -1455,6 +1455,7 @@
         var jbg = "{{ $gadai['tempoh'] }}";
         var kadarupah = "{{ $gadai['kadarupah'] }}";
         var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+        var pinjaman_lama = "{{ $gadai['bakipjm'] }}";
         var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
         var ansuran = 0;
         var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,""));
@@ -1490,6 +1491,7 @@
                 "kadarupah" : kadarupah,
                 "nilai_marhun" : nilai_marhun,
                 "pinjaman" : pinjaman,
+                "pinjaman_lama" : pinjaman_lama,
                 "ansuran" : ansuran,
                 "addpinjaman" : addpinjaman,
                 "bakipinjaman" : bakipinjaman,