From b9c89b1d6acee765abf1c6edd61382b20ef4b2e5 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 11 May 2021 16:36:47 +0800
Subject: [PATCH] fix tuntutbaki

---
 app/Http/Controllers/AliranTunaiController.php | 10 ++++++++--
 app/Http/Controllers/LelongController.php      |  6 ++++--
 resources/views/lelongan/index.blade.php       |  8 ++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index b355410..65c86a1 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -1431,7 +1431,7 @@ class AliranTunaiController extends Controller
         $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
         $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
         $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
-
+        $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
         $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
 
         $totalserahan = 0;
@@ -1501,11 +1501,17 @@ class AliranTunaiController extends Controller
             $totalupahlama += $upahlama['upahDibayar'];
         }
 
+        $totaltuntutbaki = 0;
+        foreach($tuntutbaki as $index1=>$tb)
+        {
+            $totaltuntutbaki += $tb['jumlah'];
+        }
+
         $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
         $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
         $gadaian = floatval($totalgadai);
 
-        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan));
+        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
 
         $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 5f07630..9f64533 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -91,8 +91,10 @@ class LelongController extends Controller
 
         $bakiakhir = $baki;
     
-        $bakiakhir -= $request->jumlah;
-
+        if($request->jenis == 'T')
+            $bakiakhir -= $request->jumlah;
+        else
+            $bakiakhir += -($request->jumlah);
 
         //masuk dalam tunai aliran
         $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php
index e275dfb..b1bd3fb 100644
--- a/resources/views/lelongan/index.blade.php
+++ b/resources/views/lelongan/index.blade.php
@@ -207,6 +207,8 @@
             buttonsStyling: false
         });
 
+        let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+
         swalWithBootstrapButtons.fire({
             title: 'Dapatkan Pengesahan Khazanah',
             text: "Tuntutan Baki Pelanggan!",
@@ -246,9 +248,9 @@
                     }
 
                     
-                    let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val();
+                    let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
                     let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
-                    let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+                    let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
 
                         $.ajax({
                             method:'post',
@@ -273,8 +275,6 @@
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
-                            console.log(data);
-
 
                             if(data.norujukan == norujukan)
                             {