Merged in bugfix/block-tuntutbaki (pull request #330)

Bugfix/block tuntutbaki

app/Http/Controllers/LelongController.php

@@ -99,6 +99,15 @@ class LelongController extends Controller
     public function transaksituntutbaki(Request $request){
 
         $auth_user = Auth::user();
+
+        $aliranTunaiController = new AliranTunaiController();
+        $checkCashBox = $aliranTunaiController->periksaAliranTunai($request);
+        
+        if($checkCashBox->getContent() !== 'sama')
+        {
+            return response('kemaskini', 200);
+        }
+        
         $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $request->norujukan)->json();
 
         if($lelong)
@@ -106,6 +115,18 @@ class LelongController extends Controller
             return response('Berjaya');
         }
 
+        $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
+
+        $keluar = $getTunai2['keluar'];
+        $baki = $getTunai2['baki'];
+        $masuk = $getTunai2['masuk'];
+
+        $bakiakhir = $baki;
+
+        if(($bakiakhir < $request->jumlah) && $request->jenis == 'T'){
+            return response('Baki tidak mencukupi', 200);
+        }
+
         $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
             'batchno' => $request->batchno,
             'jenis' => $request->jenis,
@@ -122,14 +143,6 @@ class LelongController extends Controller
 
         $updatetuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan);
 
-        $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
-
-        $keluar = $getTunai2['keluar'];
-        $baki = $getTunai2['baki'];
-        $masuk = $getTunai2['masuk'];
-
-        $bakiakhir = $baki;
-
         if($request->jenis == 'T')
         {
             $bakiakhir -= $request->jumlah;

resources/views/lelongan/index.blade.php

@@ -601,9 +601,26 @@ function ubahwakil(e)
             'hargajual' : hargajual
             },
             success:function(data){
-                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+
-                urlroute = urlroute.replace(':id', norujukan);
+                if(data == 'kemaskini'){
-                Swal.fire(
+                    Swal.fire(
+                        'Amaran!',
+                        'Sila kemaskini aliran tunai dahulu!',
+                        'error'
+                    )
+                    return false;
+                }
+                else if(data == 'Baki tidak mencukupi'){
+                    Swal.fire(
+                        'Amaran!',
+                        'Baki tunai tidak mencukupi. Sila tambah baki tunai dahulu!',
+                        'error'
+                    )
+                    return false;
+                }else if(data == 'Berjaya'){
+                    let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                    urlroute = urlroute.replace(':id', norujukan);
+                    Swal.fire(
                         'Berjaya!',
                         'Tuntut Baki Berjaya',
                         'success'
@@ -611,6 +628,15 @@ function ubahwakil(e)
                         window.open(urlroute, '_blank');
                         window.location.replace("{{  route('customer_info') }}");
                     })
+                }else{
+                    Swal.fire(
+                        'Amaran!',
+                        'Terdapat ralat semasa proses. Sila cuba lagi!',
+                        'error'
+                    )
+                    return false;
+                }
+            
             },error: function(xhr, status, error) {
                 var err = eval("(" + xhr.responseText + ")");
                 alert(xhr.responseText);