fix conflict

2020-12-03 12:37:34 +08:00
parent c8cb41600e
commit 09db6dfcb0
6 changed files with 260 additions and 20 deletions
@@ -184,6 +184,7 @@
        tablegadai.clear().draw();
        $.each(data,function(index,gadai){
            $.each(gadai, function(index,gadai_detail){
+                var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg'];
                tablegadai.row.add([
                    counter,
                    gadai_detail['norujukan'],
@@ -191,7 +192,7 @@
                    'RM '+formatter.format(gadai_detail['pinjaman']),
                    'RM '+ formatter.format(gadai_detail['nilaimarhun']),
                    gadai_detail['jbg'],
-                    'RM '+ formatter.format((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']),
+                    'RM '+ formatter.format(keuntungan_semasa),
                    gadai_detail['t_matang'],
                    (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                    'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),