From 117cfcf95996b8bf42e21e0ccba11dd61e2dd19b Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 19 Apr 2021 15:32:01 +0800
Subject: [PATCH] fix aliran tunai

---
 app/Http/Controllers/KhazanahController.php   | 45 ++++++++-----------
 .../views/khazanah/laporan/index.blade.php    |  2 +-
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index d27ad34..7c36ff1 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -1545,11 +1545,11 @@ class KhazanahController extends Controller
       if(sizeof($peti_besi_terkini) == 0)
       {
           $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
-          $baki_awal=$peti_besi_terkini["bakiawal"];
+          $baki_awal=$peti_besi_terkini["bakiakhir"];
       }
       else
       {
-        $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+        $baki_awal=$peti_besi_terkini[0]["bakiakhir"];
       }
 
       $amount = $request->amt;
@@ -1557,7 +1557,8 @@ class KhazanahController extends Controller
       if($amount>$baki_awal)
       {
         //WI ERROR MESSAGE SKIT
-        dd($baki_awal);
+        // dd($baki_awal);
+        return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
       }
      else
      {
@@ -1610,7 +1611,8 @@ class KhazanahController extends Controller
 
             $kurang=$kurangT;
             $keluarT = $keluar;
-            $bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
+            // $bakiAkhirT= $bakiAwal + $tambahT + $masukT - $keluarT - $kurang;
+            $bakiAkhirT = $baki + $tambah;
 
             $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
             'kodlaluan'=>$kodlaluan,
@@ -1681,20 +1683,18 @@ class KhazanahController extends Controller
       if(sizeof($peti_besi_terkini) == 0)
       {
           $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
-          $baki_awal=$peti_besi_terkini["bakiawal"];
+          $baki_awal=$peti_besi_terkini["bakiakhir"];
       }
       else
       {
-        $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+        $baki_awal=$peti_besi_terkini[0]["bakiakhir"];
       }
 
       $amount = $request->amt;
 
-      if($amount>$baki_awal)
-        echo "Maaf, Serahan Lebih Besar Dari Baki Akhir Cash Box";
-      
-      else
-      {
+      if($amount>$baki_awal){
+        return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
+      }else{
         $tarikh=$request->tarikh;
         $kodlaluan=$request->teller;
     
@@ -1726,9 +1726,8 @@ class KhazanahController extends Controller
             $tambahT=$getTunai2['tambah'];
             $kurangT=$getTunai2['kurang'];
             $masukT=$getTunai2['masuk'];
-
-            //dd($getTunai2);
             
+            $serahanakhir = $kurang;
             $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0;
         
             if($tambahT==0)
@@ -1753,21 +1752,19 @@ class KhazanahController extends Controller
                else
                 $baki_AwalT=$bakiAwalT;
     
-    
-               $bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T;
+                //$bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T; //untuk kegunaan urgent
+                $bakiAkhirT = $baki - $serahanakhir;
 
                $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
-                'kodlaluan'=>$kodlaluan,
-                'tambah'=>$tambah_T,
-                'kurang'=>$kurang_T,
-                'bakiakhir'=>$bakiAkhirT
+                    'kodlaluan'=>$kodlaluan,
+                    'tambah'=>$tambah_T,
+                    'kurang'=>$kurang_T,
+                    'bakiakhir'=>$bakiAkhirT
                  ]);
                  
-               //dd($baki_AwalT,$tambah_T,$masukT,$keluarT,$kurang_T,$bakiAkhirT);
                
                $latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
 
-               //dd($latestVault);
                $masukV=$latestVault[0]['masuk'];
                $keluarV=$latestVault[0]['keluar'];
                $pendahuluanV=$latestVault[0]['pendahuluan'];
@@ -1775,8 +1772,6 @@ class KhazanahController extends Controller
                $bakiAwalV=$latestVault[0]['bakiawal'];
                $totpanjar = $latestVault[0]['totpanjar'];
 
-
-               //dd($latestVault);
     
                $masuk_V = 0;$pendahuluan_V = 0;$keluar_V = 0;$serahan_V = 0;
                
@@ -1819,9 +1814,8 @@ class KhazanahController extends Controller
 
       $bakiAkhirV = $bakiAwalV - $keluar_V + $masuk_V + $pendahuluan_V - $serahan_V - $totpanjar;
 
-      //dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V);
       $BakiEOD=$bakiAkhirV;
-    //   $BakiEOD=$bakiAkhirV+$sumBaki;
+    //$BakiEOD=$bakiAkhirV+$sumBaki;
 
      $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
          'masuk'=>$masuk_V,
@@ -1982,7 +1976,6 @@ class KhazanahController extends Controller
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $stokaudit = Http::get(config('api.url'). '/api/gadai/cawangan/'. $auth_user['cawangan'])->json();
 
-        dd($stokaudit);
         return view('khazanah.laporan.stokaudit',compact('cawangan_info','api_url'));
     }
 
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 8ef9773..71edc49 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -69,7 +69,7 @@
                                 <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('stokaudit.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
+                                <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('ringkasanharian.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>