Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into kaunter

resources/views/customers/info.blade.php

@@ -172,6 +172,7 @@
                                         <th>Pembiayaan</th>
                                         <th>Margin</th>
                                         <th>Tempoh</th>
+                                        <th>Lelong</th>
                                     </tr>
                                 </thead>
                             </table>
@@ -719,6 +720,11 @@
                         var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
                         if(gadai_detail["bakihargajualan"] == null){
+                            if(gadai_detail['taglel'] == 1){
+                                var taglel = 'Akan Dilelong';
+                            }else{
+                                var taglel = '';
+                            }
                             xtawarruq.row.add([
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
@@ -726,7 +732,8 @@
                                 gadai_detail['t_matang'],
                                 'RM '+formatter.format(gadai_detail['pinjaman']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                                gadai_detail['tempoh']
+                                gadai_detail['tempoh'],
+                                taglel,
                             ]).draw();
                         }else{
                             tablegadai.row.add([
@@ -1599,7 +1606,7 @@
             }
             else {
 		
-		return false;
+		        return false;
 
                 $.ajax({
                     method:'get',
@@ -1745,7 +1752,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran',
-                    text: 'Hapus Gadai Tidak Dibenarkan'
+                    text: 'Hapus Tebus Tidak Dibenarkan'
                 });
                 return false;
             }
@@ -1782,14 +1789,16 @@
                     allowEnterKey: false
                 })
 
-                let mohon = "Hapus Gadai";
+                let mohon = "";
                 let id = 0;
 
                 if($("input[name='options']:checked").val() == 'belum_tebus'){
                     id = hapusid;
+                    mohon = "Hapus Gadai";
                 }
                 else if($("input[name='options']:checked").val() == 'sudah_tebus'){
                     id = hapusidsudah;
+                    mohon = "Hapus Tebus";
                 }
 
                 $.ajax({