From 85a2d0d525344fab7bb62f865fda6c534465661f Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 2 Mar 2021 16:05:13 +0800
Subject: [PATCH] fix penebusan separuh

---
 app/Http/Controllers/AliranTunaiController.php | 13 +++++++++++--
 app/Http/Controllers/KhazanahController.php    |  7 ++++++-
 resources/views/penebusan/index.blade.php      |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index d411cf8..ee56438 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -183,9 +183,18 @@ class AliranTunaiController extends Controller
  
         }else{
  
-             $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
+            if($tebus_detail['jenistebus'] == 'S')
+            {
+                $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
+                $bakiakhir = $bakiakhir + $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'];
+            }else{
+                $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
+                $bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
+            }
+
+            //  $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
             //  $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
-            $bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
+            
  
              $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                  'kodlaluan' => $tebus_detail['teller'],   
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 1c4f5ac..56e7848 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -242,7 +242,12 @@ class KhazanahController extends Controller
 
        }else{
 
-            $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
+            if($tebus_detail['jenistebus'] == 'S')
+            {
+                $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
+            }else{
+                $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
+            }
             // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
 
             $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 4d10ace..ade3e59 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1071,8 +1071,8 @@
             var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
             var ansuran = 0;
             var addpinjaman = 0;
-            var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");;
-            var bakiupah = 0;
+            var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
+            var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
             var historygadaian = "{{ $gadai['norujukan'] }}";
             var marhun = "{{ $gadai['marhun'] }}";
             var noic = "{{ $gadai['nokp'] }}";