Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 17a5bfafdd | |||
| 5f29f064a0 | |||
| 9dae32a462 |
+3
-1
@@ -55,4 +55,6 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
|
|||||||
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
|
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
|
||||||
|
|
||||||
MYKAD_READER_PORT=17321
|
MYKAD_READER_PORT=17321
|
||||||
MYKAD_READER_ENABLED_CAWANGAN='' # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED
|
MYKAD_READER_ENABLED_CAWANGAN=''
|
||||||
|
|
||||||
|
INTERNAL_NOTIFICATION_SECRET=staging_noti_secret
|
||||||
@@ -185,6 +185,7 @@
|
|||||||
<th>Keuntungan</th>
|
<th>Keuntungan</th>
|
||||||
<th>Lelong</th>
|
<th>Lelong</th>
|
||||||
<th>Pembayaran Terakhir</th>
|
<th>Pembayaran Terakhir</th>
|
||||||
|
<th>Tarikh Ansuran Terkini</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
</table>
|
</table>
|
||||||
@@ -204,6 +205,7 @@
|
|||||||
<th>Keuntungan</th>
|
<th>Keuntungan</th>
|
||||||
<th>Lelong</th>
|
<th>Lelong</th>
|
||||||
<th>Pembayaran Terakhir</th>
|
<th>Pembayaran Terakhir</th>
|
||||||
|
<th>Tarikh Ansuran Terkini</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
</table>
|
</table>
|
||||||
@@ -634,6 +636,45 @@
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function tarikhAnsuranTerkini(transactions)
|
||||||
|
{
|
||||||
|
if (!Array.isArray(transactions)) {
|
||||||
|
throw new Error('Invalid transaction response');
|
||||||
|
}
|
||||||
|
return transactions.reduce(function(latest, transaction) {
|
||||||
|
if (transaction.trans_type !== 'A') return latest;
|
||||||
|
var date = String(transaction.created_at || '').slice(0, 10);
|
||||||
|
if (!/^\d{4}-\d{2}-\d{2}$/.test(date)) return latest;
|
||||||
|
return date > latest ? date : latest;
|
||||||
|
}, '') || 'Tiada bayaran';
|
||||||
|
}
|
||||||
|
|
||||||
|
function muatTarikhAnsuranTerkini(row, norujukan)
|
||||||
|
{
|
||||||
|
var originalData = row.data();
|
||||||
|
function update(value) {
|
||||||
|
// Ignore responses for rows removed when the customer/table changes.
|
||||||
|
if (row.data() !== originalData) return;
|
||||||
|
var updatedData = originalData.slice();
|
||||||
|
updatedData[11] = value;
|
||||||
|
row.data(updatedData).draw(false);
|
||||||
|
}
|
||||||
|
$.ajax({
|
||||||
|
method: 'get',
|
||||||
|
url: api_url + '/api/transaction/' + encodeURIComponent(norujukan),
|
||||||
|
success: function(transactions) {
|
||||||
|
try {
|
||||||
|
update(tarikhAnsuranTerkini(transactions));
|
||||||
|
} catch (error) {
|
||||||
|
update('Gagal dimuatkan');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function() {
|
||||||
|
update('Gagal dimuatkan');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function gadaiTable(data,jenistebus){
|
function gadaiTable(data,jenistebus){
|
||||||
|
|
||||||
var counter = 1;
|
var counter = 1;
|
||||||
@@ -693,8 +734,8 @@
|
|||||||
let table_norujukan = gadai_detail["norujukan"];
|
let table_norujukan = gadai_detail["norujukan"];
|
||||||
// let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
|
// let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
|
||||||
|
|
||||||
if(gadai_detail["percentpinj"] != 0)
|
if(gadai_detail["percentpinj"] != 0) {
|
||||||
xtawarruq.row.add([
|
var ansuranRow = xtawarruq.row.add([
|
||||||
'<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
|
'<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
|
||||||
// '<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>',
|
// '<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>',
|
||||||
(function() {
|
(function() {
|
||||||
@@ -724,8 +765,11 @@
|
|||||||
let color = bayaranInfo.blocked ? 'red' : 'green';
|
let color = bayaranInfo.blocked ? 'red' : 'green';
|
||||||
return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' +
|
return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' +
|
||||||
bayaranInfo.tarikh + '</div>';
|
bayaranInfo.tarikh + '</div>';
|
||||||
})()
|
})(),
|
||||||
|
'Memuatkan...'
|
||||||
]).draw();
|
]).draw();
|
||||||
|
muatTarikhAnsuranTerkini(ansuranRow, gadai_detail['norujukan']);
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
var taglel = '';
|
var taglel = '';
|
||||||
if(gadai_detail['taglel'] == 1){
|
if(gadai_detail['taglel'] == 1){
|
||||||
@@ -757,7 +801,7 @@
|
|||||||
|
|
||||||
let table_norujukan = gadai_detail["norujukan"];
|
let table_norujukan = gadai_detail["norujukan"];
|
||||||
// let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
|
// let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
|
||||||
tablegadai.row.add([
|
var ansuranRow = tablegadai.row.add([
|
||||||
'<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
|
'<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
|
||||||
// '<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>',
|
// '<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>',
|
||||||
(function() {
|
(function() {
|
||||||
@@ -787,8 +831,10 @@
|
|||||||
let color = bayaranInfo.blocked ? 'red' : 'green';
|
let color = bayaranInfo.blocked ? 'red' : 'green';
|
||||||
return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' +
|
return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' +
|
||||||
bayaranInfo.tarikh + '</div>';
|
bayaranInfo.tarikh + '</div>';
|
||||||
})()
|
})(),
|
||||||
|
'Memuatkan...'
|
||||||
]).draw();
|
]).draw();
|
||||||
|
muatTarikhAnsuranTerkini(ansuranRow, gadai_detail['norujukan']);
|
||||||
}
|
}
|
||||||
}else if(jenistebus == "sudah_tebus"){
|
}else if(jenistebus == "sudah_tebus"){
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user