hotfix:ubah hapus gadai

Reviewed-on: #25

.env.staging

@@ -55,4 +55,6 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 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

resources/views/customers/v2/info.blade.php

@@ -2067,7 +2067,7 @@
             harini.setHours(0, 0, 0, 0);
 
             if ($("input[name='options']:checked").val() == 'belum_tebus') {
-                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text();
                 let tarikhgadai2 = new Date(test1);
                 tarikhgadai2.setHours(0, 0, 0, 0);
                 if (+harini !== +tarikhgadai2) {
@@ -2080,7 +2080,7 @@
                 }
             } else if ($("input[name='options']:checked").val() == 'sudah_tebus') {
 
-                let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+                let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(3)').text();
                 let tarikhgadai1 = new Date(test);
                 tarikhgadai1.setHours(0, 0, 0, 0);
 
@@ -2484,7 +2484,7 @@
             }
 
             if ($("input[name='options']:checked").val() == 'belum_tebus') {
-                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text();
                 let tarikhgadai2 = new Date(test1);
                 tarikhgadai2.setHours(0, 0, 0, 0);
 
@@ -2669,7 +2669,7 @@
                 // return false;
 
             } else if ($("input[name='options']:checked").val() == 'sudah_tebus') {
-                let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+                let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(3)').text();
                 let tarikhgadai1 = new Date(test);
                 tarikhgadai1.setHours(0, 0, 0, 0);
 

resources/views/khazanah/v2/info.blade.php

@@ -185,6 +185,7 @@
                                         <th>Keuntungan</th>
                                         <th>Lelong</th>
                                         <th>Pembayaran Terakhir</th>
+                                        <th>Tarikh Ansuran Terkini</th>
                                     </tr>
                                 </thead>
                             </table>
@@ -204,6 +205,7 @@
                                         <th>Keuntungan</th>
                                         <th>Lelong</th>
                                         <th>Pembayaran Terakhir</th>
+                                        <th>Tarikh Ansuran Terkini</th>
                                     </tr>
                                 </thead>
                             </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){
 
     var counter = 1;
@@ -693,8 +734,8 @@
                     let table_norujukan = gadai_detail["norujukan"];
                     // let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
 
-                    if(gadai_detail["percentpinj"] != 0)
-                    xtawarruq.row.add([
+                    if(gadai_detail["percentpinj"] != 0) {
+                    var ansuranRow = xtawarruq.row.add([
                         '<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>',
                         (function() {
@@ -724,8 +765,11 @@
                                     let color = bayaranInfo.blocked ? 'red' : 'green';
                                     return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' + 
                                     bayaranInfo.tarikh + '</div>';
-                                })()        
+                                })(),
+                        'Memuatkan...'
                     ]).draw();
+                    muatTarikhAnsuranTerkini(ansuranRow, gadai_detail['norujukan']);
+                    }
                 }else{
                     var taglel = '';
                     if(gadai_detail['taglel'] == 1){
@@ -757,7 +801,7 @@
 
                     let table_norujukan = gadai_detail["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"/>',
                         // '<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() {
@@ -787,8 +831,10 @@
                                     let color = bayaranInfo.blocked ? 'red' : 'green';
                                     return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' + 
                                     bayaranInfo.tarikh + '</div>';
-                                })()        
+                                })(),
+                        'Memuatkan...'
                     ]).draw();
+                    muatTarikhAnsuranTerkini(ansuranRow, gadai_detail['norujukan']);
                 }
             }else if(jenistebus == "sudah_tebus"){