Experiment/merge annur (#20)

Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local> Reviewed-on: #20
2026-09-20 12:49:39 +08:00
parent 8a2bae7a88
commit 918502b504
30 changed files with 1011 additions and 190 deletions
@@ -52,6 +52,7 @@
                                        <th>No K/P</th>
                                        <th>Tarikh Pembiayaan</th>
                                        <th>No Rujukan</th>
+                                        <th>Cara Terima</th>
                                        <th>Pembiayaan (RM)</th>
                                        <th>Keuntungan Lain-lain Caj (RM) </th>
                                        <th>Keuntungan 1% (RM)</th>
@@ -61,7 +62,7 @@
                                    </tr>
                                </thead>
                                <tfoot class="thead-dark">
-                                    <th colspan="5">TOTAL</th>
+                                    <th colspan="6">TOTAL</th>
                                    <th id="pinjamantotal"></th>
                                    <th id="ujrahtotal"></th>
                                    <th id="onepercenttotal"></th>
@@ -300,6 +301,10 @@
            
            total_upah12 += upah12;
            
+            var caraTerima = String(gadai['cara_terima'] || 'TUNAI').toUpperCase() === 'ONLINE'
+                ? 'Online'
+                : 'Tunai';
+
            // Pastikan semua nilai ada sebelum add row
            tablegadai.row.add([
                counter,
@@ -307,6 +312,7 @@
                gadai['nokp'] || '-',                        
                gadai['t_gadai'] || '-',
                gadai['norujukan'] || '-',
+                caraTerima,
                formatter.format(pinjaman),
                formatter.format(ujrah * 12),
                formatter.format(onepercent * 12),