new calculation upah

This commit is contained in:
afiq
2021-02-25 05:24:23 +08:00
parent d037e1ff0e
commit 1e65336028
29 changed files with 498 additions and 356 deletions
+5 -17
View File
@@ -417,12 +417,11 @@
tablegadai.clear().draw();
tabledahtebus.clear().draw();
tablelelong.clear().draw();
$.each(data,function(index,gadai_detail){
var upah_semasa = (Number(gadai_detail['kadarupah'])/100) * Number(gadai_detail['bakipjm']) * Number(gadai_detail['jbg']);
if(jenistebus == "belum_tebus"){
var urlroute = '{{ route("penebusan", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
tablegadai.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
@@ -432,7 +431,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
'RM '+ formatter.format(upah_semasa.toFixed(2))
]).draw();
}else if(jenistebus == "sudah_tebus"){
@@ -445,7 +444,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
'RM '+ formatter.format(upah_semasa.toFixed(2))
]).draw();
}else if(jenistebus == "lelong"){
@@ -458,7 +457,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
'RM '+ formatter.format(upah_semasa.toFixed(2))
]).draw();
}
counter = counter + 1;
@@ -587,8 +586,6 @@
var urlroute = '{{ route("resit.ansuran", ":id") }}';
urlroute = urlroute.replace(':id', bayaran['id']);
console.log(bayaran['']);
historybayarandatatable.row.add([
counter,
bayaran['created_at'],
@@ -714,8 +711,7 @@
"norujukan" : ubahid,
"mohon" : mohon
},
success:function(data){
console.log(data);
success:function(data){
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
@@ -734,10 +730,7 @@
"norujukan" : ubahid
},
success:function(data){
console.log(data);
if(data != 0){
console.log('berjaya');
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
@@ -776,7 +769,6 @@
let hapusid = $('input[name="belum"]:checked').val();
let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
let harini = new Date();harini.setHours(0, 0, 0, 0);
console.log(hapusid);
if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
Swal.fire({
icon: 'error',
@@ -868,7 +860,6 @@
"mohon" : mohon
},
success:function(data){
console.log(data);
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
@@ -887,7 +878,6 @@
},
success:function(data){
if(data != 0){
console.log('berjaya');
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
@@ -925,7 +915,6 @@
method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
success:function(data){
console.log(data);
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire(
'Hapus!',
@@ -1155,7 +1144,6 @@
},
dataType:'json',
success: function(otp_token){
console.log(otp_token['error']);
if(otp_token['error']){
Swal.fire({
icon: 'error',