Merged in izzati-hotfix-lastbayar-arcc (pull request #196)
tambah column tarikh pembayaran terakhir di arcc
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
@section('content')
|
||||
@include('modal.historytebus')
|
||||
@include('modal.wakil')
|
||||
<div class="container">
|
||||
<div class="container-fluid">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-12 col-lg-12">
|
||||
|
||||
@@ -175,6 +175,7 @@
|
||||
<th>Tempoh</th>
|
||||
<th>Keuntungan</th>
|
||||
<th>Lelong</th>
|
||||
<th>Pembayaran Terakhir</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
@@ -203,6 +204,7 @@
|
||||
<th>Tempoh</th>
|
||||
<th>Keuntungan</th>
|
||||
<th>Lelong</th>
|
||||
<th>Pembayaran Terakhir</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
@@ -758,6 +760,7 @@
|
||||
if(gadai_detail["tagbaru"] == 0){
|
||||
$('#textnavsag').addClass('text-danger');
|
||||
var taglel = '';
|
||||
var lastbayar = '';
|
||||
if(gadai_detail['taglel'] == 1){
|
||||
if(tagarrahnbid == 1){
|
||||
$.ajax({
|
||||
@@ -767,6 +770,8 @@
|
||||
|
||||
success: function(data){
|
||||
taglel = data.lelong.t_lelong;
|
||||
console(taglel);
|
||||
lastbayar = data.lelong.lastbayar;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -791,18 +796,20 @@
|
||||
if(gadai_detail["percentpinj"] != 0)
|
||||
xtawarruq.row.add([
|
||||
'<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
|
||||
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||
gadai_detail['t_gadai'],
|
||||
tarikh_matang,
|
||||
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
|
||||
'RM '+formatter.format(gadai_detail['bakipjm']),
|
||||
'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['tempoh'],
|
||||
'RM '+ upahsemasa,
|
||||
'RM'+ upahsemasa,
|
||||
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
|
||||
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + lastbayar + '</div>',
|
||||
]).draw();
|
||||
}else{
|
||||
var taglel = '';
|
||||
var lastbayar = '';
|
||||
if(gadai_detail['taglel'] == 1){
|
||||
if(tagarrahnbid == 1){
|
||||
$.ajax({
|
||||
@@ -812,6 +819,7 @@
|
||||
|
||||
success: function(data){
|
||||
taglel = data.lelong.t_lelong;
|
||||
lastbayar = data.lelong.lastbayar;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -837,12 +845,13 @@
|
||||
'<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||
gadai_detail['t_gadai'],
|
||||
tarikh_matang,
|
||||
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
|
||||
'RM '+formatter.format(gadai_detail['bakipjm']),
|
||||
'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['tempoh'],
|
||||
'RM '+ formatter.format(upahsemasa['pendapatan']),
|
||||
'RM'+ formatter.format(upahsemasa['pendapatan']),
|
||||
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
|
||||
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + lastbayar + '</div>',
|
||||
]).draw();
|
||||
}
|
||||
}else if(jenistebus == "sudah_tebus"){
|
||||
|
||||
Reference in New Issue
Block a user