fix skit2

app/Http/Controllers/AliranTunaiController.php

@@ -170,7 +170,7 @@ class AliranTunaiController extends Controller
         {
               
              $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
-             $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
+             $totalmasuk = $tebus_detail['bakiupah'] + $masuk;  
  
             //  $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
                 $bakiakhir = $bakiakhir + $tebus_detail['bakiupah'] - $tebus_detail['addpinjaman'];

app/Http/Controllers/KhazanahController.php

@@ -91,7 +91,18 @@ class KhazanahController extends Controller
 
         $listgldetail = Http::get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
 
-        return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail'));
+        $denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        else
+        {
+            $denominasi=$denominasi[0];
+        }
+
+        return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi'));
     }
 
     public function dashboard()
@@ -338,15 +349,6 @@ class KhazanahController extends Controller
 
     }
 
-    ///PANJAR///
-
-    public function panjarlist()
-    {
-
-    }
-
-    ///END PANJAR///
-
 
     ///KELULUSAN///
 
@@ -610,6 +612,8 @@ class KhazanahController extends Controller
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
+        $bakiperubatan = 0;
+
         switch ($request->jenismodal) {
             case "selenggara":
                 $kategori = "Baiki dan Selenggara";
@@ -644,7 +648,7 @@ class KhazanahController extends Controller
             'tag' => $tag,
             'kategori' => $kategori,
             'id' => $auth_user['name'],
-            'bakiperubatan' => "0",
+            'bakiperubatan' => $bakiperubatan,
             'nobaucer' => $request->baucer,
             'nobil' => "3213231",
             'tuntutoleh' => $request->tuntutan    
@@ -1599,7 +1603,10 @@ class KhazanahController extends Controller
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.panjar',compact('cawangan_info','api_url'));
+
+        $usercawangan = User::where('cawangan','=',$auth_user['cawangan'])->get();
+
+        return view('khazanah.panjar',compact('cawangan_info','api_url','usercawangan'));
     }
 
     public function unjuran()

app/Http/Controllers/LelongController.php

@@ -34,7 +34,6 @@ class LelongController extends Controller
 
         $gadai = $gadaidetail[0][0];
         
-
         return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong'));
     }