From e90886130c70e257c9d6087421eb06793cf00f30 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Fri, 10 Oct 2025 20:32:37 +0800 Subject: [PATCH 1/2] block tuntutbaki --- app/Http/Controllers/LelongController.php | 29 ++++++++++++++------ resources/views/lelongan/index.blade.php | 32 ++++++++++++++++++++--- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0f2f558..f89e51b 100644 --- a/app/Http/Controllers/LelongController.php +++ b/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', 403); + } + $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', 403); + } + $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; diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 0e953b0..2eab543 100644 --- a/resources/views/lelongan/index.blade.php +++ b/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); - Swal.fire( + + if(data == 'kemaskini'){ + 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); From 42493bd265ba1c98442b0e9c4f52111ae9e14689 Mon Sep 17 00:00:00 2001 From: aiman Date: Sun, 26 Oct 2025 16:27:28 +0800 Subject: [PATCH 2/2] Change the status from 403 to 200 --- app/Http/Controllers/LelongController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f89e51b..eb861af 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -105,7 +105,7 @@ class LelongController extends Controller if($checkCashBox->getContent() !== 'sama') { - return response('kemaskini', 403); + 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(); @@ -124,7 +124,7 @@ class LelongController extends Controller $bakiakhir = $baki; if(($bakiakhir < $request->jumlah) && $request->jenis == 'T'){ - return response('Baki tidak mencukupi', 403); + return response('Baki tidak mencukupi', 200); } $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [