From 83103924469891fcce537431df25093c08728ea9 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 17 Feb 2021 10:19:14 +0800
Subject: [PATCH 1/2] fix Cust

---
 app/Http/Controllers/KhazanahController.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 32e10b7..a7ee5d3 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -825,8 +825,6 @@ class KhazanahController extends Controller
         $baki_awal=$peti_besi_terkini[0]["bakiawal"];
       }
 
-      
-
       $amount = $request->amt;
 
       if($amount>$baki_awal)
@@ -882,9 +880,9 @@ class KhazanahController extends Controller
 
             $tambahT=$tambah + $tam;
 
-              $kurang=$kurangT;
-              $keluarT = $keluar;
-              $bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
+            $kurang=$kurangT;
+            $keluarT = $keluar;
+            $bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
 
             $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
             'kodlaluan'=>$kodlaluan,
@@ -902,7 +900,8 @@ class KhazanahController extends Controller
                 
             // return;
             //  dd($tambahT);
-             $keluarV=$tambahT;
+            //  $keluarV=$tambahT;
+            $keluarV = $tambah + $keluarV;
              
              $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
              
@@ -974,6 +973,7 @@ class KhazanahController extends Controller
         $nota=$request->nota;
         $kodcaw=$auth_user['cawangan'];
         $tambahT = 0;
+        $kurangvault = $request->amt;
                     
         $addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
             'kodcaw'=>$kodcaw,
@@ -1052,11 +1052,11 @@ class KhazanahController extends Controller
                
                 if($masukV == 0)
                 {
-                    $masuk_V = 0 + $kurang_T;
+                    $masuk_V = 0 + $kurangvault;
                 }
                 else
                 {
-                    $masuk_V=$masukV + $kurang_T;
+                    $masuk_V = $masukV + $kurangvault;
                 }
                     
                 if($keluarV == 0)

From 10111cb53529e9030a392fbca91a8a19700f1935 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 17 Feb 2021 10:27:37 +0800
Subject: [PATCH 2/2] change bakiawal to bakiakhir

---
 app/Http/Controllers/KhazanahController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a7ee5d3..3eda978 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -88,7 +88,7 @@ class KhazanahController extends Controller
         //Peti Besi Cawangan
         $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
 
-        $getVault = $getVault[0]['bakiawal'];
+        $getVault = $getVault[0]['bakiakhir'];
 
         //Dashboardall
         $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();