diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 1055576..c640c9b 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -418,49 +418,55 @@
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([
- '',
- '' + gadai_detail['norujukan'] + '',
- gadai_detail['t_gadai'],
- gadai_detail['t_matang1'],
- '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(upah_semasa.toFixed(2))
- ]).draw();
- }else if(jenistebus == "sudah_tebus"){
-
- tabledahtebus.row.add([
- '',
- gadai_detail['norujukan'],
- gadai_detail['t_update'],
- gadai_detail['t_matang1'],
- '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(upah_semasa.toFixed(2))
- ]).draw();
- }else if(jenistebus == "lelong"){
-
- tablelelong.row.add([
- counter,
- gadai_detail['norujukan'],
- gadai_detail['t_gadai'],
- gadai_detail['t_matang1'],
- '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(upah_semasa.toFixed(2))
- ]).draw();
- }
- counter = counter + 1;
+ $.ajax({
+ method:'get',
+ url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+ success:function(upahsemasa){
+ if(jenistebus == "belum_tebus"){
+ var urlroute = '{{ route("penebusan", ":id") }}';
+ urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+ tablegadai.row.add([
+ '',
+ '' + gadai_detail['norujukan'] + '',
+ gadai_detail['t_gadai'],
+ gadai_detail['t_matang1'],
+ '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(upahsemasa)
+ ]).draw();
+ }else if(jenistebus == "sudah_tebus"){
+
+ tabledahtebus.row.add([
+ '',
+ gadai_detail['norujukan'],
+ gadai_detail['t_update'],
+ gadai_detail['t_matang1'],
+ '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(upahsemasa)
+ ]).draw();
+ }else if(jenistebus == "lelong"){
+
+ tablelelong.row.add([
+ counter,
+ gadai_detail['norujukan'],
+ gadai_detail['t_gadai'],
+ gadai_detail['t_matang1'],
+ '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(upahsemasa)
+ ]).draw();
+ }
+ counter = counter + 1;
+ }
+ });
+
});