From ccd5962dbf88a27bbc61fd2c94b7f3f30aef7932 Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Feb 2021 17:15:14 +0800 Subject: [PATCH] new update --- resources/views/customers/info.blade.php | 85 ++++++++++++++++---- resources/views/modal/historytebus.blade.php | 67 +++++++++++---- resources/views/penebusan/index.blade.php | 37 --------- 3 files changed, 123 insertions(+), 66 deletions(-) diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 963c7e4..6df3a06 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -18,7 +18,6 @@
-
@@ -302,8 +301,8 @@ No Rujukan Tarikh Gadai Tarikh Matang - Nilai Marhun - Pembiayaan + Baki Harga Jualan + Baki Pembiayaan Margin Tempoh Keuntungan @@ -320,8 +319,8 @@ No Rujukan Tarikh Gadai Tarikh Matang - Nilai Marhun - Pembiayaan + Baki Harga Jualan + Baki Pembiayaan Margin Tempoh Keuntungan @@ -336,8 +335,8 @@ No Rujukan Tarikh Gadai Tarikh Matang - Nilai Marhun - Pembiayaan + Baki Harga Jualan + Baki Pembiayaan Margin Tempoh Keuntungan @@ -348,7 +347,7 @@
- +
@@ -404,6 +403,10 @@ "scrollX": true }); + var historybayarandatatable = $('#tablehistorybayaran').DataTable({ + "ordering": false + }); + const formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -425,8 +428,8 @@ '' + gadai_detail['norujukan'] + '', gadai_detail['t_gadai'], gadai_detail['t_matang1'], - 'RM '+ formatter.format(gadai_detail['nilaimarhun']), - 'RM '+formatter.format(gadai_detail['pinjaman']), + 'RM '+ formatter.format(gadai_detail['bakihargajualan']), + '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'])) @@ -438,8 +441,8 @@ gadai_detail['norujukan'], gadai_detail['t_gadai'], gadai_detail['t_matang1'], - 'RM '+ formatter.format(gadai_detail['nilaimarhun']), - 'RM '+formatter.format(gadai_detail['pinjaman']), + 'RM '+ formatter.format(gadai_detail['bakihargajualan']), + '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'])) @@ -451,8 +454,8 @@ gadai_detail['norujukan'], gadai_detail['t_gadai'], gadai_detail['t_matang1'], - 'RM '+ formatter.format(gadai_detail['nilaimarhun']), - 'RM '+formatter.format(gadai_detail['pinjaman']), + 'RM '+ formatter.format(gadai_detail['bakihargajualan']), + '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'])) @@ -495,7 +498,6 @@ function histfunc(){ if($("input[name='options']:checked").val() == 'belum_tebus'){ let histid = $('input[name="belum"]:checked').val(); - if(histid == null){ Swal.fire({ icon: 'error', @@ -516,6 +518,20 @@ alert(xhr.responseText); } }); + $.ajax({ + method: 'get', + url: api_url + '/api/transaction/' + histid, + success: function(data){ + historybayarantable(data); + } + }); + $.ajax({ + method:'get', + url:api_url + '/api/gadai/norujukan/'+histid, + success:function(gadai){ + rekodasal(gadai); + } + }); } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let histid = $('input[name="sudahtebus"]:checked').val(); @@ -539,9 +555,48 @@ alert(xhr.responseText); } }); + $.ajax({ + method: 'get', + url: api + '/api/transaction/' + histid, + success: function(data){ + historybayarantable(data); + } + }); + $.ajax({ + method:'get', + url:api_url + '/api/gadai/norujukan/'+histid, + success:function(gadai){ + rekodasal(gadai); + } + }); } } + } + function rekodasal(gadaian){ + $('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan'])); + $('#pembiayaanmodal').text('RM ' + formatter.format(gadaian[0][0]['pinjaman'])); + $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun'])); + } + + function historybayarantable(data){ + var counter = 1; + + historybayarandatatable.clear().draw(); + $.each(data,function(index,bayaran){ + + var urlroute = '{{ route("resit.ansuran", ":id") }}'; + urlroute = urlroute.replace(':id', bayaran['id']); + + console.log(bayaran['']); + historybayarandatatable.row.add([ + counter, + bayaran['created_at'], + "RM " + bayaran['duit_masuk'], + 'Cetak' + ]).draw(); + counter = counter + 1; + }); } var historytebusbayaran = $('#tablehistorytebus').DataTable({ diff --git a/resources/views/modal/historytebus.blade.php b/resources/views/modal/historytebus.blade.php index 56a9631..1606d6b 100644 --- a/resources/views/modal/historytebus.blade.php +++ b/resources/views/modal/historytebus.blade.php @@ -8,23 +8,62 @@
-
- - +
+
+
+
Harga Jualan :
+
+
+
Pembiayaan :
+
+
+
Nilai Marhun :
+
+
+ +
+
+
+

Rekod Bayaran

+
+ - - - - - + + + + - - - - -
BilNo RujukanJenis TebusJBGTarikh TebusBilTarikh BayaranBayaranAction
+ + + + +
+
+
+

Rekod SAG

+ + + + + + + + + + + + +
BilNo RujukanJenis TebusJBGTarikh Tebus
+
+
-
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index ddec107..f9c6774 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -264,7 +264,6 @@
-
@@ -1475,42 +1474,6 @@ function ubahwakil(e) } -function historybayaran() -{ - $.ajax({ - method: 'get', - url: api + '/api/transaction/' + norujukan, - success: function(data) - { - historybayarantable(data); - $('#historybayaranModal').modal(); - } - }); -} - - - - function historybayarantable(data){ - var counter = 1; - - historybayarandatatable.clear().draw(); - $.each(data,function(index,bayaran){ - - var urlroute = '{{ route("resit.ansuran", ":id") }}'; - urlroute = urlroute.replace(':id', bayaran['id']); - - console.log(bayaran['']); - historybayarandatatable.row.add([ - counter, - bayaran['created_at'], - "RM " + bayaran['duit_masuk'], - 'Cetak' - ]).draw(); - counter = counter + 1; - }); - } - - // Restricts input for the set of matched elements to the given inputFilter function. (function($) { $.fn.inputFilter = function(inputFilter) {