KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix skit2 ttg denominasi dan vault

Browse Source
This commit is contained in:
fifi97
2021-08-31 20:51:15 +08:00
parent 6be75ba1b4
commit 16bb9bfd5b
4 changed files with 102 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KakitanganController.php
+44 -16
View File
@@ -98,27 +98,55 @@ class KakitanganController extends Controller
$tunaisemalam = Http::get(config('api.url') . '/api/GetTunaiSemalam/'. $auth_user['cawangan'])->json(); $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) if(sizeof($latesttunai) == 0)
{ {
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [ $alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $tunsem['kodcaw'], 'kodcaw' => $tunsem['kodcaw'],
'teller' => $tunsem['kodlaluan'], 'teller' => $tunsem['kodlaluan'],
'bakiawal' => $tunsem['baki'], 'bakiawal' => $tunsem['baki'],
'masuk' => 0.00, 'masuk' => 0.00,
'yuran' => 0.00, 'yuran' => 0.00,
'keluar' => 0.00, 'keluar' => 0.00,
'baki' => $tunsem['baki'], 'baki' => $tunsem['baki'],
'tambah' => 0.00, 'tambah' => 0.00,
'kurang' => 0.00 'kurang' => 0.00
])->json(); ])->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'); return redirect()->route('home');
public/js/main.js
Vendored
+18
View File
@@ -165,6 +165,7 @@ function kiraan(datakeyin)
var valkey = $(datakeyin).val(); var valkey = $(datakeyin).val();
var amount = 0; var amount = 0;
let amountkiraan = 0; let amountkiraan = 0;
var id = $('#jenisjenis').val();
var validate = parseFloat($('#amaundiminta').val()); var validate = parseFloat($('#amaundiminta').val());
@@ -178,6 +179,23 @@ function kiraan(datakeyin)
amount += arr[1]; 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) if(amount > validate)
{ {
Swal.fire({ Swal.fire({
resources/views/khazanah/pendahuluanserahanmain.blade.php
+30 -4
View File
@@ -27,7 +27,7 @@
@endphp @endphp
<div class="col-12 d-flex justify-content-end"> <div class="col-12 d-flex justify-content-end" style="visibility: hidden;">
<button class="btn btn-danger fas fa-trash-alt" onclick="togglepadam();"></button> <button class="btn btn-danger fas fa-trash-alt" onclick="togglepadam();"></button>
</div> </div>
@@ -244,10 +244,11 @@
if(boolamaun === false && boolketerangan === false && booljenis === false) if(boolamaun === false && boolketerangan === false && booljenis === false)
{ {
console.log('masuk');
$('#amaundiminta').val(amaun); $('#amaundiminta').val(amaun);
$('#denominasiHQModal').modal('show'); $('#denominasiHQModal').modal('show');
$('#pendahuluanserahanModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide');
$('#jenisjenis').val(jenis);
return true; return true;
}else{ }else{
@@ -303,6 +304,7 @@
$("#terima_transaksi").prop('disabled', true); $("#terima_transaksi").prop('disabled', true);
let amaun = $('#amaundiminta').val(); let amaun = $('#amaundiminta').val();
let kiraan = $('#amaunkiraan').val();
let keterangan = $('#keterangan').val(); let keterangan = $('#keterangan').val();
let jenis = $('#radiopendahuluanserahan:checked').val(); let jenis = $('#radiopendahuluanserahan:checked').val();
let dtacct = $('#dtacct').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 ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();
let ringgit100 = $('#ringgit100').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({ $.ajax({
method: 'post', method: 'post',
url: '{{ route("khazanah.pendahuluanserahanHQ") }}', url: '{{ route("khazanah.pendahuluanserahanHQ") }}',
@@ -352,7 +374,9 @@
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Transaksi Berjaya' title: 'Transaksi Berjaya',
allowEscapeKey : false,
allowOutsideClick: false
}).then(function(){ }).then(function(){
$('#denominasiHQModal').modal('hide'); $('#denominasiHQModal').modal('hide');
@@ -363,7 +387,9 @@
}else if(data == 'GAGAL'){ }else if(data == 'GAGAL'){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
title: 'Transaksi Gagal' title: 'Transaksi Gagal',
allowEscapeKey : false,
allowOutsideClick: false
}).then(function(){ }).then(function(){
$('#denominasiHQModal').modal('hide'); $('#denominasiHQModal').modal('hide');
resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+10 -10
View File
@@ -67,51 +67,51 @@
<tr> <tr>
<td>RM0.01</td> <td>RM0.01</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-deno="{{ $denominasi['txtsen1'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
<td>RM1</td> <td>RM1</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-deno="{{ $denominasi['txtring1'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.05</td> <td>RM0.05</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-deno="{{ $denominasi['txtsen5'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
<td>RM5</td> <td>RM5</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-deno="{{ $denominasi['txtring5'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.10</td> <td>RM0.10</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-deno="{{ $denominasi['txtsen10'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
<td>RM10</td> <td>RM10</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-deno="{{ $denominasi['txtring10'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.20</td> <td>RM0.20</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-deno="{{ $denominasi['txtsen20'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
<td> RM20</td> <td> RM20</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-deno="{{ $denominasi['txtring20'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.50</td> <td>RM0.50</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-deno="{{ $denominasi['txtsen50'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
<td>RM50</td> <td>RM50</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td> <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="kiraan(this)"/> </td> <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-deno="{{ $denominasi['txtring50'] }}" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td> <td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
<tr> <tr>