From fd2969584d18af1254c0718f66b239364a0c86d4 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 2 Mar 2021 15:04:17 +0800
Subject: [PATCH] fix aliran tunai

---
 app/Http/Controllers/KhazanahController.php | 3 +--
 resources/views/penebusan/index.blade.php   | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a87726e..1c4f5ac 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/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,
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 58f3bc3..4d10ace 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/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,