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

fix aliran tunai dan kelulusan

Browse Source
This commit is contained in:
hafifierahman
2021-02-16 09:59:37 +08:00
parent 93b234b2f9
commit 92caaec739
8 changed files with 260 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/index.blade.php
+22 -6
View File
@@ -891,16 +891,32 @@
if(data != '')
{
clearInterval(timerInterval);
Swal.fire({
if(data == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan'
}).then(function(){
$("#terima_gadai").prop('disabled', false);
return false;
});
}else{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
});
});
}
}
},error: function(xhr, status, error) {
resources/views/homepage/khazanah/home.blade.php
+22 -1
View File
@@ -18,7 +18,7 @@
<a href="{{ url('kakitangan') }}" class="btn btn-primary btn-lg btn-block mb-3">Kakitangan</a>
</div>
<div class="row">
<a href="{{ url('kelulusan') }}" class="btn btn-primary btn-lg btn-block mb-3">Kelulusan</a>
<a href="{{ url('kelulusan') }}" id="btnkelulusan" class="btn btn-primary btn-lg btn-block mb-3">Kelulusan</a>
</div>
<div class="row">
<a href="{{ url('unjuran') }}" class="btn btn-danger btn-lg btn-block mb-3">Unjuran</a>
@@ -57,4 +57,25 @@
</div>
</div>
</div>
<script>
var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
cluster: 'ap1',
encrypted: true
});
var cawangankhazanah = '{{ Auth::user()->cawangan }}';
var channel = pusher.subscribe('status-liked');
channel.bind('my-event', function(data) {
// let message = JSON.stringify(data);
if(cawangankhazanah == data.cawangan)
{
$('#btnkelulusan').removeClass("btn-primary").addClass("btn-success");
}
});
</script>
@endsection
resources/views/khazanah/kelulusan.blade.php
+4 -2
View File
@@ -44,7 +44,7 @@
<td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td>
<td><button class="btn btn-primary mr-2" data-pelulus="{{ $k['pelulus'] }}" onclick="updatelulus(this)" data-norujukan="{{ $k['norujukan'] }}"><i class="fas fa-thumbs-up"></i></button>
<button class="btn btn-danger" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
<button class="btn btn-danger" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
</tr>
@endforeach
@foreach($kelulusanmohonid as $index=>$km)
@@ -151,13 +151,15 @@
{
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
$.ajax({
method:'put',
url: "{{ route('khazanah.updatekelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"pelulus" : pelulus
"pelulus" : pelulus,
"pembatalan" : "batal"
},
success:function(data){
console.log(data);
resources/views/khazanah/khazanahserahan.blade.php
+59 -22
View File
@@ -8,7 +8,7 @@
<div class="row justify-content-center">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Pendahuluan Wang Peti Besi') }}</div>
<div class="card-header">{{ __('Serahan Wang Peti Besi') }}</div>
<div class="card-body text-center">
@@ -18,16 +18,16 @@
<div class="col-2">Tarikh</div>
<div class="col-3"><input type="text" class="form-control" id="tarikh" readonly name="tarikh" value="{{ $currdate=date('Y-m-d')}}" /></div>
<div class="col-2">Teller ID </div>
<div class="col-3"><input type="text" class="form-control" name="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
<div class="col-3"><input type="text" class="form-control" name="teller" id="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
</div>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
<div class="row">
<div class="col-2">Amaun (RM)</div>
<div class="col-3"><input type="text" class="form-control" data-amaun="{{ $array_reqteller['serahan'] }}" name="amt" id="amt"/></div>
<div class="col-3"><input type="text" class="form-control" data-amaun="{{ $array_reqteller['serahan'] }}" value="{{ $array_reqteller['serahan'] }}" readonly name="amt" id="amt"/></div>
<div class="col-2"> Nota</div>
<div class="col-4"><input type="text" class="form-control" value="P1" name="nota" id="nota" /> </div>
<div class="col-3"><input type="text" class="form-control" readonly name="nota" id="nota" /> </div>
</div>
<br>
<div class="row">
@@ -36,7 +36,7 @@
<div class="col-2"> </div>
<div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Terima"/>
<input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
<a href="{{ url('/serahan') }}" class="btn btn-danger">Batal</a>
</div>
</div>
@@ -69,31 +69,31 @@
<tr>
<td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" data-jenis="serahan" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" data-jenis="serahan" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" data-jenis="serahan" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" data-jenis="serahan" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" data-jenis="serahan" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td>
<td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" data-jenis="serahan" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td>
</tr>
</table>
@@ -129,51 +129,51 @@
<td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-jenis="serahan" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-jenis="serahan" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-jenis="serahan" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-jenis="serahan" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-jenis="serahan" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-jenis="serahan" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-jenis="serahan" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-jenis="serahan" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-jenis="serahan" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-jenis="serahan" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td>
</tr>
<tr>
@@ -183,7 +183,7 @@
<td></td>
<td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td>
</tr>
</table>
@@ -299,6 +299,43 @@
<script>
let api = "{{ config('api.url') }}";
$(document).ready(function() {
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
let notasebenar = '';
$.ajax({
method: 'get',
url: api + '/api/getAddTunaiLatest/' + kodcaw,
async:false,
data: {
'jenisnota' : 'serahan',
'kodlaluan' : teller
},
success:function(data){
if(data.nota == null)
{
notasebenar = "S1";
$('#nota').val(notasebenar);
}
else{
let nota = data.nota.substring(1);
notasebenar = "S" + (Number(nota)+1);
$('#nota').val(notasebenar);
}
}
});
});
function triggersubmit()
{
$('#form-pendahuluan').trigger('submit');
resources/views/khazanah/pendahuluanserah.blade.php
+39 -2
View File
@@ -18,7 +18,7 @@
<div class="col-2">Tarikh</div>
<div class="col-3"><input type="text" class="form-control" id="tarikh" readonly name="tarikh" value="{{ $currdate=date('Y-m-d')}}" /></div>
<div class="col-2">Teller ID </div>
<div class="col-3"><input type="text" class="form-control" name="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
<div class="col-3"><input type="text" class="form-control" name="teller" id="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
</div>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
@@ -26,7 +26,7 @@
<div class="col-2">Amaun (RM)</div>
<div class="col-3"><input type="text" class="form-control" value="{{ $array_reqteller['modal'] }}" readonly data-amaun="{{ $array_reqteller['modal'] }}" name="amt" id="amt"/></div>
<div class="col-2">Nota</div>
<div class="col-3"><input type="text" class="form-control" value="P1" name="nota" id="nota"/> </div>
<div class="col-3"><input type="text" class="form-control" value="P1" readonly name="nota" id="nota"/> </div>
</div>
<br>
<div class="row">
@@ -305,6 +305,43 @@
<script>
let api = "{{ config('api.url') }}";
$(document).ready(function() {
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
let notasebenar = '';
$.ajax({
method: 'get',
url: api + '/api/getAddTunaiLatest/' + kodcaw,
async:false,
data: {
'jenisnota' : 'pendahuluan',
'kodlaluan' : teller
},
success:function(data){
if(data.nota == null)
{
notasebenar = "P1";
$('#nota').val(notasebenar);
}
else{
let nota = data.nota.substring(1);
notasebenar = "P" + (Number(nota)+1);
$('#nota').val(notasebenar);
}
}
});
});
function triggersubmit()
{
$('#form-pendahuluan').trigger('submit');