separate version1 and version2
This commit is contained in:
Hafifie PKB
+1
-1
@@ -1077,4 +1077,4 @@ function ubahwakil(e)
|
||||
|
||||
|
||||
</script>
|
||||
@endsection
|
||||
@endsection
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+93
-17
@@ -167,7 +167,7 @@
|
||||
<div class="card-body">
|
||||
<form action="">
|
||||
<div class="col-12 form-group row">
|
||||
<div class="col-6" id="divbakihargajualan">
|
||||
<div class="col-6 flex-column-reverse d-flex" id="divbakihargajualan">
|
||||
<div class="form-group row">
|
||||
<div class="col-4">
|
||||
BAKI HARGA JUALAN(RM)
|
||||
@@ -206,9 +206,31 @@
|
||||
</div>
|
||||
|
||||
<div class="col-6">
|
||||
@if($gadai['tagbaru'] == 1)
|
||||
<div class="form-group row">
|
||||
<div class="col-4">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<span>UJRAH</span>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<span>KEUNTUNGAN</span>
|
||||
</div>
|
||||
|
||||
<div class="col-4">
|
||||
</div>
|
||||
|
||||
<div class="col-4">
|
||||
<input type="text" id="jumujrah" class="form-control" readonly/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<input type="text" id="jumonepercent" class="form-control" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="form-group row">
|
||||
<div class="col-4">
|
||||
JUMLAH KEUNTUNGAN
|
||||
JUMLAH PENDAPATAN
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="jumlahupah" class="form-control" readonly/>
|
||||
@@ -564,16 +586,30 @@
|
||||
let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
|
||||
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
|
||||
data: {
|
||||
'jeniskeuntungan' : jeniskeuntungan
|
||||
},
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#jumlahupah').val(data);
|
||||
if(jeniskeuntungan == 'asal')
|
||||
{
|
||||
$('#jumlahupah').val(data);
|
||||
}else{
|
||||
$('#jumlahupah').val(data['pendapatan']);
|
||||
$('#jumujrah').val(data['ujrah']);
|
||||
$('#jumonepercent').val(data['keuntungan']);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
|
||||
url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
|
||||
data: {
|
||||
'jeniskeuntungan' : jeniskeuntungan
|
||||
},
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#bayaranditerima').val(data);
|
||||
@@ -1176,6 +1212,7 @@
|
||||
{
|
||||
$("#terima_transaksi").prop('disabled', true);
|
||||
var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
|
||||
|
||||
if($('#sltjenistebus').find(":selected").val() == 'T'){
|
||||
|
||||
var adadah = false;
|
||||
@@ -1257,7 +1294,16 @@
|
||||
var nowakil = nw;
|
||||
var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
|
||||
var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
|
||||
console.log('test');
|
||||
|
||||
|
||||
if(duitpelanggan < bakipinjaman){
|
||||
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
|
||||
$("#terima_transaksi").prop('disabled', false);
|
||||
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
method:'get',
|
||||
datatype: 'json',
|
||||
@@ -1376,6 +1422,13 @@
|
||||
var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
|
||||
var bakipelanggan = parseFloat($('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""));
|
||||
|
||||
if(duitpelanggan < bayar){
|
||||
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
|
||||
$("#terima_transaksi").prop('disabled', false);
|
||||
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
|
||||
if(bayar < jumupah){
|
||||
$("#terima_transaksi").prop('disabled', false);
|
||||
@@ -1411,7 +1464,7 @@
|
||||
},
|
||||
success:function(success_data){
|
||||
|
||||
if(success_data != 'error'){
|
||||
if(success_data == 'success'){
|
||||
var urlroute = '{{ route("resit.ansurans", ":id") }}';
|
||||
urlroute = urlroute.replace(':id', norujukan);
|
||||
|
||||
@@ -2177,20 +2230,31 @@
|
||||
var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
|
||||
|
||||
let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
|
||||
total = keuntungan + lebihanmargin;
|
||||
total = (jenisAT != 'hargalama') ? (keuntungan + lebihanmargin) : keuntungan;
|
||||
|
||||
var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100;
|
||||
|
||||
let texting = (jenisAT != 'hargalama') ? 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin' : 'Bayaran harus melebihi keuntungan';
|
||||
if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){
|
||||
Swal.fire({
|
||||
icon: 'error',
|
||||
title: 'Ralat Bayaran!',
|
||||
text: 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin'
|
||||
text: texting
|
||||
});
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
|
||||
var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
|
||||
|
||||
if(duitpelanggan < parseFloat($('#perludibayarAT').val())){
|
||||
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
|
||||
$("#terima_transaksi").prop('disabled', false);
|
||||
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api + '/api/komuditi/check',
|
||||
@@ -2501,6 +2565,7 @@
|
||||
function gadaiautotawarruq()
|
||||
{
|
||||
|
||||
let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
|
||||
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
|
||||
var jenistebus = 'T';
|
||||
var jbg = "{{ $gadai['tempoh'] }}";
|
||||
@@ -2575,7 +2640,7 @@
|
||||
"nowakil" : nowakil,
|
||||
"jenisbayarantebus" : "nottawarruq",
|
||||
"teller" : teller,
|
||||
|
||||
"jeniskeuntungan" : jeniskeuntungan,
|
||||
|
||||
//yang baru
|
||||
"noic" : noic,
|
||||
@@ -3206,10 +3271,14 @@ function pembatalanbalik()
|
||||
|
||||
function funcexcuse(toggle){
|
||||
|
||||
|
||||
|
||||
if(toggle){
|
||||
let pembiayaan = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""));
|
||||
var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
|
||||
let percentasal = parseFloat('{{ number_format($percent_asal,2) }}');
|
||||
var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
|
||||
var bakipjm = parseFloat("{{ $gadai['bakipjm'] }}");
|
||||
|
||||
const swalWithBootstrapButtons = Swal.mixin({
|
||||
customClass: {
|
||||
@@ -3262,9 +3331,9 @@ function funcexcuse(toggle){
|
||||
"komen" : '',
|
||||
"margin" : marg,
|
||||
"berat" : ber,
|
||||
"nilaimarhun" : nm,
|
||||
"nilaimarhun" : nilai_marhun_lama,
|
||||
"status" : status,
|
||||
"jumpinjam" : jumpinjam,
|
||||
"jumpinjam" : bakipjm,
|
||||
"teller" : teller
|
||||
},
|
||||
success:function(data){
|
||||
@@ -3449,19 +3518,26 @@ function blockbayaranAT(event){
|
||||
let value = $(event).val();
|
||||
let upah = parseFloat($('#jumlahupah').val());
|
||||
let pembiayaan = parseFloat("{{ $pembiayaanbaru }}");
|
||||
let pembiayaanlama = parseFloat("{{ $bakipjm }}");
|
||||
let hargamarhun = parseFloat("{{ $nilaihargasemasa }}");
|
||||
let percentlama = parseFloat(" {{ $percent_asal }} ");
|
||||
|
||||
totalpercent = (pembiayaan / hargamarhun) * 100;
|
||||
|
||||
let nilaimargin = $('#txtlebihanmargin').val();
|
||||
let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
|
||||
total = upah + lebihanmargin;
|
||||
total = (jenisAT != 'hargalama') ? (upah + lebihanmargin) : upah;
|
||||
|
||||
if(value == '' || value <= 0 || value < total){
|
||||
$('#perludibayarAT').val(formatter.format(total));
|
||||
$('#pinjamanbaru').val(formatter.format(pembiayaan));
|
||||
$('#basic-addon2').text(formatter.format(totalpercent.toFixed(2)));
|
||||
|
||||
if(jenisAT != 'hargalama'){
|
||||
$('#perludibayarAT').val(formatter.format(total));
|
||||
$('#pinjamanbaru').val(formatter.format(pembiayaan));
|
||||
$('#basic-addon2').text(formatter.format(totalpercent.toFixed(2)));
|
||||
}else{
|
||||
$('#perludibayarAT').val(formatter.format(total));
|
||||
$('#pinjamanbaru').val(formatter.format(pembiayaanlama));
|
||||
$('#basic-addon2').text(formatter.format(percentlama.toFixed(2)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user