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

fix kelulusan

Browse Source
This commit is contained in:
hafifierahman
2021-02-25 09:21:09 +08:00
parent 21a026e6b3
commit 348f337bbf
7 changed files with 113 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/aliran_tunai/index.blade.php
-1
View File
@@ -112,7 +112,6 @@
<div class="col-md-12 text-center">
<input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
<input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="openuptambahdanserah(this)">
<input type="button" class="btn btn-lg btn-primary" value="KEMASKINI" onclick="location.reload();">
</div>
</div>
<div class="row mt-3">
resources/views/customers/info.blade.php
+27 -1
View File
@@ -606,13 +606,34 @@
historytebusbayaran.clear().draw();
$.each(data,function(index,tebusaz){
switch(tebusaz['jenistebus']) {
case 'P':
var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'T':
console.log("tebusan" + tebusaz['norujukan']);
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'S':
var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
}
historytebusbayaran.row.add([
counter,
tebusaz['norujukan'],
tebusaz['jenistebus'],
tebusaz['jbg'],
tebusaz['t_tebus'],
'<a class="btn btn-info" target="_blank">Cetak</a>'
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
]).draw();
counter = counter + 1;
});
@@ -893,10 +914,14 @@
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
let teller = "{{ Auth::user()->name }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){
$.ajax({
method:'put',
url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid,
data: { 'kodlaluan' : teller },
success:function(data){
$.ajax({
method:'put',
@@ -924,6 +949,7 @@
$.ajax({
method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
data: { 'kodlaluan' : teller },
success:function(data){
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire(
resources/views/khazanah/kelulusan.blade.php
+2 -1
View File
@@ -115,6 +115,7 @@
</thead>
<tbody>
@foreach($arraykelulusan as $index=>$k)
{{-- {{ dd($k) }} --}}
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['namateller'] }}</td>
@@ -405,7 +406,7 @@
success:function(data){
Swal.fire({
icon: 'success',
title: 'Pengesahan Berjaya'
title: 'Pengesahan Berjaya Dibatalkan'
}).then(function(){
location.reload();
resources/views/penebusan/index.blade.php
+7 -39
View File
@@ -770,8 +770,8 @@
var pinjaman = "{{ $gadai['pinjaman']}}";
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = $('#perludibayar').val();
var bakiupah = $('#jumlahupah').val();
var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
var historygadaian = 0;
var marhun = "{{ $gadai['marhun'] }}";
var nowakil = nw;
@@ -1238,7 +1238,6 @@
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
// $("#terima_gadai").prop('disabled', false);
return false;
});
}
@@ -1338,8 +1337,7 @@
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
tambahpinjamanfunc();
return true;
});
@@ -1361,36 +1359,6 @@
});
//TIME INTERVAL
// let timerInterval;
// timerInterval = setInterval(function(){
// $.ajax({
// method:'get',
// url: "{{ route('operasi.getkelulusan') }}",
// data: {
// "norujukan" : norujukan
// },
// success:function(data){
// if(data != ''){
// clearInterval(timerInterval);
// Swal.fire({
// icon: 'success',
// title: 'Telah Disahkan'
// }).then(function(){
// $(func).attr("onSubmit","return true;");
// $(func).submit();
// return true;
// });
// }
// },
// error: function(xhr, status, error) {
// var err = eval("(" + xhr.responseText + ")");
// alert(xhr.responseText);
// }
// });
// }, 3000);
}else if (result.dismiss === Swal.DismissReason.cancel){
$("#terima_transaksi").prop('disabled', false);
@@ -1432,12 +1400,12 @@
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
var pinjaman = parseFloat($('#pinjamanbaru').val());
var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
var ansuran = 0;
var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val());
var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val());
var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,""));
var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,""));
var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val());
var bakiupah = $('#bayaranditerima').val();
var bakiupah = $('#bayaranditerima').val().replace(/[^0-9.-]+/g,"");
var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}";
var total_berat = parseFloat("{{ $gadai['berat'] }}");