diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php index 94eacc1..fb4903c 100644 --- a/app/Http/Controllers/KakitanganController.php +++ b/app/Http/Controllers/KakitanganController.php @@ -98,27 +98,55 @@ class KakitanganController extends Controller $tunaisemalam = Http::get(config('api.url') . '/api/GetTunaiSemalam/'. $auth_user['cawangan'])->json(); - if (sizeof($tunaisemalam) > 0) + if(is_array($tunaisemalam)) { - foreach($tunaisemalam as $index=>$tunsem){ + if (sizeof($tunaisemalam) > 0) + { + foreach($tunaisemalam as $index=>$tunsem){ - $latesttunai = Http::get(config('api.url') . '/api/GetCurrentTunai/'. $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) - { - $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(); + 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(); + } } } + + //Denominasi + $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]; + } + + //Peti Besi Cawangan + $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); + + if(sizeof($getVault) == 0) + { + $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); + $getVault = $peti_besi_terkini['bakiakhir']; + + }else{ + $getVault = $getVault[0]['bakiakhir']; + } + } return redirect()->route('home'); diff --git a/public/js/main.js b/public/js/main.js index 8137f25..c6819e4 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -165,6 +165,7 @@ function kiraan(datakeyin) var valkey = $(datakeyin).val(); var amount = 0; let amountkiraan = 0; + var id = $('#jenisjenis').val(); var validate = parseFloat($('#amaundiminta').val()); @@ -178,6 +179,23 @@ function kiraan(datakeyin) amount += arr[1]; }); + if(id === 'serahan') + { + var deno = $(datakeyin).data('deno'); + + if(amount > deno) + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Peti Besi tidak mencukupi!' + }); + + return false; + } + + } + if(amount > validate) { Swal.fire({ diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index 6ecfe44..e97b63e 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -27,7 +27,7 @@ @endphp -
+ @@ -244,10 +244,11 @@ if(boolamaun === false && boolketerangan === false && booljenis === false) { - console.log('masuk'); $('#amaundiminta').val(amaun); $('#denominasiHQModal').modal('show'); $('#pendahuluanserahanModal').modal('hide'); + $('#jenisjenis').val(jenis); + return true; }else{ @@ -303,6 +304,7 @@ $("#terima_transaksi").prop('disabled', true); let amaun = $('#amaundiminta').val(); + let kiraan = $('#amaunkiraan').val(); let keterangan = $('#keterangan').val(); let jenis = $('#radiopendahuluanserahan:checked').val(); let dtacct = $('#dtacct').val(); @@ -317,6 +319,26 @@ let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val(); let ringgit100 = $('#ringgit100').val(); + if(Number(amaun) !== Number(kiraan)) + { + Swal.fire({ + icon: 'error', + title: 'Sila Periksa Amaun dan Kiraan.' + }); + + return false; + } + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + $('#denominasiHQModal').modal('hide'); + } + }); + $.ajax({ method: 'post', url: '{{ route("khazanah.pendahuluanserahanHQ") }}', @@ -352,7 +374,9 @@ Swal.fire({ icon: 'success', - title: 'Transaksi Berjaya' + title: 'Transaksi Berjaya', + allowEscapeKey : false, + allowOutsideClick: false }).then(function(){ $('#denominasiHQModal').modal('hide'); @@ -363,7 +387,9 @@ }else if(data == 'GAGAL'){ Swal.fire({ icon: 'error', - title: 'Transaksi Gagal' + title: 'Transaksi Gagal', + allowEscapeKey : false, + allowOutsideClick: false }).then(function(){ $('#denominasiHQModal').modal('hide'); diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index c5f5b76..ae8f497 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -67,51 +67,51 @@ RM0.01 - + RM1 - + RM0.05 - + RM5 - + RM0.10 - + RM10 - + RM0.20 - + RM20 - + RM0.50 - + RM50 - +