Merge branch 'pipi' into 'master'

fix skit2

See merge request online-sistem1/kaunter!73

resources/views/customers/info.blade.php

@@ -337,13 +337,10 @@
                             <tr>
                                 <th>Bil</th>
                                 <th>No Rujukan</th>
-                                <th>Tarikh Update</th>
+                                <th>Tarikh Tebus</th>
-                                <th>Tarikh Matang</th>
-                                <th>Baki Harga Jualan</th>
                                 <th>Baki Pembiayaan</th>
                                 <th>Margin</th>
                                 <th>Tempoh</th>
-                                <th>Keuntungan</th>
                             </tr>
                         </thead>
                     </table>
@@ -416,7 +413,6 @@
     });
 
     var tabledahtebus = $('#dahtebusTable').DataTable({
-        "scrollX": true
     });
 
     var tablelelong = $('#lelongTable').DataTable({
@@ -462,12 +458,9 @@
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
                             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'],
+                            gadai_detail['jbg']
-                            'RM '+ formatter.format(upahsemasa)
                         ]).draw();
                     }else if(jenistebus == "lelong"){