From c00ee59dd07eb0572bc691d8aecc013eb25ca33f Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 18 Jul 2021 17:02:19 +0800
Subject: [PATCH 1/2] add serahan baki dan block perubatan lebih

---
 app/Http/Controllers/KakitanganController.php | 27 +++++++++++++++++++
 app/Http/Controllers/KhazanahController.php   | 13 +++++++++
 resources/views/lelongan/index.blade.php      | 20 ++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php
index 59781ed..52a101a 100644
--- a/app/Http/Controllers/KakitanganController.php
+++ b/app/Http/Controllers/KakitanganController.php
@@ -90,6 +90,33 @@ class KakitanganController extends Controller
             ));
         }
 
+        // Check teller tak serah baki tunai untuk generate balik
+        
+        $tunaisemalam = Http::get(config('api.url') . '/api/GetTunaiSemalam/'. $auth_user['cawangan'])->json();
+
+        if (sizeof($tunaisemalam) > 0)
+        {
+            foreach($tunaisemalam as $index=>$tunsem){
+
+                $latesttunai = Http::get(config('api.url') . '/api/GetLatestTunai/'. $auth_user['cawangan'], ['kodlaluan' => $tunsem['kodlaluan']])->json();
+
+                if(sizeof($latesttunai) == 0)
+                {
+                    $alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
+                        'kodcaw' => $tunsem['kodcaw'],
+                        'teller' => $tunsem['kodlaluan'],
+                        'bakiawal' => $tunsem['baki'],
+                        'masuk' => 0.00,
+                        'yuran' => 0.00,
+                        'keluar' => 0.00,
+                        'baki' => $tunsem['baki'],
+                        'tambah' => 0.00,
+                        'kurang' => 0.00
+                    ])->json(); 
+                }
+            }
+        }
+
         return redirect()->route('home');
     }
 
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 138ee2a..23c21a6 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -734,6 +734,19 @@ class KhazanahController extends Controller
                break;
           }
 
+        
+        if($request->jenismodal === 'perubatan')
+        {
+            $listUser=User::where('name','=',$request->tuntutan)->get();
+
+            if(floatval($request->bayaran) > floatval($listUser[0]->perubatan))
+            {
+                return redirect('/panjar')->with('messageinformation','Baki perubatan tidak mencukupi.');
+            }
+        }
+
+
+
         $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
         
         //bundle initialize
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php
index 85af903..b32ad3f 100644
--- a/resources/views/lelongan/index.blade.php
+++ b/resources/views/lelongan/index.blade.php
@@ -199,6 +199,26 @@
 
     function bayarantuntubaki()
     {
+
+        let norujukan = $('#norujukan').val();
+                    let api = "{{ config('api.url') }}";
+                    let nowakil = 0;
+                    let jenis = '';
+
+                    if($("input[name='radlelong']:checked").val() == 'baki')
+                    {
+                        jenis = 'T';
+                        let mohon = "Tuntut Baki Lelongan";
+                    }else{
+                        jenis = 'B';
+                        let mohon = "Bayar Baki Lelongan";
+                    }
+
+                    
+        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().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
+
 	$.ajax({
             method: 'put',
             url: "{{ route('lelong.tuntutbaki') }}",

From a04a5b5f9e9d63a62fbf5f19661da68f63a8d8ba Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 19 Jul 2021 15:12:30 +0800
Subject: [PATCH 2/2] kakitangancontroller

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

diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php
index 52a101a..63723ec 100644
--- a/app/Http/Controllers/KakitanganController.php
+++ b/app/Http/Controllers/KakitanganController.php
@@ -98,7 +98,7 @@ class KakitanganController extends Controller
         {
             foreach($tunaisemalam as $index=>$tunsem){
 
-                $latesttunai = Http::get(config('api.url') . '/api/GetLatestTunai/'. $auth_user['cawangan'], ['kodlaluan' => $tunsem['kodlaluan']])->json();
+                $latesttunai = Http::get(config('api.url') . '/api/GetCurrentTunai/'. $auth_user['cawangan'], ['kodlaluan' => $tunsem['kodlaluan']])->json();
 
                 if(sizeof($latesttunai) == 0)
                 {