Merge branch 'new-pipi' into 'new-super'

New pipi

See merge request online-sistem1/kaunter!151

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/GetCurrentTunai/'. $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');
     }
 

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

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') }}",