From 3712ac4bf37bf1b0b45352d5532d20dd9f7405ef Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 22 Mar 2022 18:42:47 +0800
Subject: [PATCH] fix skit2

---
 app/Http/Controllers/KhazanahController.php   | 20 +++++++++++--------
 .../views/khazanah/permohonanwang.blade.php   |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a3d12ed..7538cdf 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -3493,16 +3493,20 @@ class KhazanahController extends Controller
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
        //Peti Besi Cawangan
-        $getVault=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
+        // $getVault=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/TunaiDiTangan/'.$auth_user['cawangan'])->json();
 
-        if(sizeof($getVault) == 0)
-        {
-            $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
-            $getVault = $peti_besi_terkini['bakiakhir'];
+        $getVault = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikhsemasa])->json();
 
-        }else{
-            $getVault = $getVault[0]['bakiakhir'];
-        }
+
+
+        // if(sizeof($getVault) == 0)
+        // {
+        //     $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
+        //     $getVault = $peti_besi_terkini['bakiakhir'];
+
+        // }else{
+        //     $getVault = $getVault[0]['bakiakhir'];
+        // }
 
 
         //Dashboardall
diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php
index 882b7ed..9a0d0ef 100644
--- a/resources/views/khazanah/permohonanwang.blade.php
+++ b/resources/views/khazanah/permohonanwang.blade.php
@@ -51,7 +51,7 @@
                                         <th>Tarikh Mohon</th>
                                         <th>Jumlah Mohon (RM)</th>
                                         <th>Jenis Permohonan</th>
-                                        <th>Act</th>
+                                        <th>Semak</th>
                                     </tr>
                                 </thead>
                                 <tbody>