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

Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter into pipiv2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-04 09:54:35 +08:00
parent 1c500be45d 4fe892a7eb
commit b878c4c398
6 changed files with 849 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/penebusan/index.blade.php
+178 -79
View File
@@ -67,9 +67,14 @@
<div class="col-8">
<select class="form-control" id="sltjenistebus">
<option value="T">T = Tebus</option>
<option value="A">A = Ansuran</option>
<option value="S">S = Separuh</option>
<option value="P">P = Tambah Pembiayaan</option>
@if($gadai['hargajualan'] != null)
<option value="A">A = Ansuran</option>
<option value="S">S = Separuh</option>
<option value="P">P = Tambah Pembiayaan</option>
@endif
@if($gadai['hargajualan'] == null)
<option value="U">U = Bayaran Upah</option>
@endif
</select>
</div>
</div>
@@ -206,15 +211,15 @@
<div class="form-group row" id="divhargaemassemasa">
<div class="col-4">
PEMBIAYAAN H. SEMASA (RM)
PEMBIAYAAN H. ASAL (RM)
</div>
@php
$percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
$percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
@endphp
<div class="col-8 input-group mb-2">
<input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($gadai['bakipjm'],2) }}" aria-describedby="basic-hargaemas" readonly/>
<div class="input-group-append">
<span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_hargaemassemasa,2) }}</span>
<span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_asal,2) }}</span>
</div>
</div>
</diV>
@@ -245,7 +250,6 @@
<input type="text" id="tambahpinjam" onkeyup="bayarpinjam(this)" placeholder="0.00" class="form-control"/>
</div>
<div class="col-4">
<input type="text" id="tambahpinjamsebenar" placeholder="0.00" class="form-control" disabled/>
</div>
</diV>
@@ -259,7 +263,6 @@
</div>
<div class="col-8 input-group mb-2">
<input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
<div class="input-group-append">
<span class="input-group-text" id="basic-separuh"></span>
</div>
@@ -283,15 +286,15 @@
<div class="form-group row">
<div class="col-4">
PINJAMAN BARU(RM)
PEMBIAYAAN BARU(RM)
</div>
@php
$percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
$percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
@endphp
<div class="col-8 input-group mb-3">
<input type="text" id="pinjamanbaru" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
<div class="input-group-append">
<span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span>
<span class="input-group-text" id="basic-addon2">{{ number_format($percent_hargaemassemasa,2) }}</span>
</div>
</div>
</div>
@@ -671,93 +674,114 @@
switch($(this).val()) {
case "T":
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$("#bayaran").prop("disabled", true);
$("#perludibayar").prop("readonly", true);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
$("#bayaran").prop("disabled", true);
$("#perludibayar").prop("readonly", true);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
tebusan();
break;
tebusan();
break;
case "A":
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$("#bayaran").prop("disabled", false);
$("#perludibayar").prop("readonly", true);
$("#bayaran").val(0);
$("#bayaran").prop("disabled", false);
$("#perludibayar").prop("readonly", true);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
$('#perludibayar').val(formatter.format(jumupah));
$('#perludibayar').val(formatter.format(jumupah));
break;
break;
case "S":
$('input[type="checkbox"]').show();
$('span.spannar').hide();
$('input[type="checkbox"]').show();
$('span.spannar').hide();
$("#bayaran").prop("disabled", true);
$("#perludibayar").prop("readonly", false);
$("#bayaran").val(0);
$("#bayaran").prop("disabled", true);
$("#perludibayar").prop("readonly", false);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divhargaemassemasa').hide();
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divhargaemassemasa').hide();
$('#divbakipinjaman').show();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
$('#divbakipinjaman').show();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
$('#perludibayar').val(formatter.format(jumupah));
break;
$('#perludibayar').val(formatter.format(jumupah));
break;
case "P":
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$('#divpinjaman').show();
$('#divtambahpinjaman').show();
$('#divpinjamanbaru').show();
$('#divbayaranditerima').show();
$('#divhargaemassemasa').show();
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$('#divpinjaman').show();
$('#divtambahpinjaman').show();
$('#divpinjamanbaru').show();
$('#divbayaranditerima').show();
$('#divhargaemassemasa').show();
$('#divtelahdibayar').hide();
$('#divbakipinjaman').hide();
$('#divbayaran').hide();
$('#divperludibayar').hide();
$('#divtelahdibayar').hide();
$('#divbakipinjaman').hide();
$('#divbayaran').hide();
$('#divperludibayar').hide();
$("#bayaran").prop("disabled", false);
$("#bayaran").val(0);
break;
$("#bayaran").prop("disabled", false);
$("#bayaran").val(0);
break;
case "U":
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$("#bayaran").prop("disabled", false);
$("#perludibayar").prop("readonly", true);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
$('#divtelahdibayar').hide();
$('#divbayaran').hide();
$('#divperludibayar').show();
$('#perludibayar').val(formatter.format(jumupah));
break;
}
});
@@ -845,17 +869,24 @@
totalpinjbaru = pinjam + parseFloat(e.value);
console.log(totalpinjbaru);
var maxpinjaman = nmsemasa * 0.7;
var bakimaxpinjaman = maxpinjaman - totalpinjbaru;
$(e).val() == '' ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
$(e).val() == '' ? $('#hargapembiayaansemasa').val(pinjam.toFixed(2)) : $('#hargapembiayaansemasa').val(totalpinjbaru.toFixed(2));
// if(parseFloat($(e).val()) > maxpinjam)
// $(e).val(maxpinjam);
var total = totalpinjbaru/nm * 100;
var totalsemasa = totalpinjbaru/nmsemasa * 100;
$(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
$(e).val() == '' ? $('#basic-hargaemas').text(percentpemb.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
var total = totalpinjbaru/nmsemasa * 100;
var totalsemasa = totalpinjbaru/nm * 100;
$(e).val() == '' ? $('#tambahpinjamsebenar').val(maxpinjam.toFixed(2)) : $('#tambahpinjamsebenar').val(bakimaxpinjaman.toFixed(2));
$(e).val() == '' ? $('#basic-addon2').text(percentpemb.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
$(e).val() == '' ? $('#basic-hargaemas').text(percentpinj.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
}
@@ -959,7 +990,7 @@
}
if(hargajualan != ''){
var bayar = $('#bayaran').val();
var bayar = $('#bayaran').val();
var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
if(bayar > bakipinjam){
@@ -1676,6 +1707,74 @@
}
tambahpinjamanfunc();
}else if($('#sltjenistebus').find(":selected").val() == 'U'){
var urlroute = '{{ route("resit.advansur", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var prkod = "{{ $gadai['prkod'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
var pinjaman = "{{ $gadai['pinjaman']}}";
var ansuran = 0;
var addpinjaman = 0;
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;
$.ajax({
method:'post',
url: api + '/api/ansuran/create/' + kodcaw,
datatype: 'json',
data:{
'norujukan' : norujukan,
'nopelanggan' : nopelanggan,
'nilaimarhun' : nilai_marhun,
'pinjaman' : pinjaman,
'kadarupah' : kadarupah,
'glcode' : "1000/010",
'upahsebenar' : bakipinjaman,
'upahdibayar' : bakipinjaman,
'teller' : teller,
'prkod' : prkod,
'jbg' : jbg,
'nowakil' : 0,
'hubungan' : 0,
'historygadaian' : norujukan
},
success:function(data){
$.ajax({
method: 'put',
url: "{{ route('alirantunai.advansur') }}",
async:false,
data:{
'norujukan' : norujukan,
"_token": "{{ csrf_token() }}"
},
success:function(data){
console.log(data);
}, error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Pembayaran Upah Berjaya',
}).then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
}
})
}
//Bayaran Semua function end file
@@ -1861,7 +1960,7 @@
var kadarupahbaru = 0;
if(nilai_marhun > 0 && nilai_marhun < 401.99){
kadarupahbaru = 1.2/100;
kadarupahbaru = 1.20/100;
}else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
kadarupahbaru = 1.50/100;
}else if(nilai_marhun >= 2002 ){