fix sedikit2

resources/views/khazanah/info.blade.php

@@ -688,23 +688,33 @@
         }
     }
 
-    function ulangcetakagh()
+    function ulangcetakagh(e)
     {
-        if($("input[name='options']:checked").val() == 'belum_tebus'){
+        var komen2 = $(e).data('komen2');
+
+        if(komen2 !== null)
+        {
+            if($("input[name='options']:checked").val() == 'belum_tebus'){
             let histid = $('input[name="belum"]:checked').val();
-            if(histid == null){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Sila pilih salah satu SAG'
-                });
-            }else{
-                let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
-                urlroute = urlroute.replace(':id', histid);
-                window.open(urlroute, '_blank');
-                swal.close();
+                if(histid == null){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Sila pilih salah satu SAG'
+                    });
+                }else{
+                    let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
+                    urlroute = urlroute.replace(':id', histid);
+                    window.open(urlroute, '_blank');
+                    swal.close();
+                }
             }
+        }else{
+            $('#AGHModalEdit').modal('show');
+            swal.close(); 
         }
+
+        return;
     }
 
     function saghilangfunc()
@@ -724,6 +734,7 @@
                     data:{ "norujukan" : histid,"kodcaw" : kodcaw},
                     success:function(data)
                     {
+
                         var count = Object.keys(data).length;
 
                         if(count > 0)
@@ -735,7 +746,7 @@
                                 showConfirmButton: false,
                                 html:   "<br>" +
                                         '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
                                 icon: 'error',
                                 title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
                             });

resources/views/khazanah/kelulusan.blade.php

@@ -311,6 +311,7 @@
             allowOutsideClick: false
         })
 
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let nm = $(e).closest('tr').children('td:eq(4)').text();
         let ber = $(e).closest('tr').children('td:eq(5)').text();
         let marg = $(e).closest('tr').children('td:eq(6)').text();
@@ -322,6 +323,8 @@
         let siri = $(e).data('siri');
         let namakhazanah = "{{ Auth::user()->name }}";
 
+        teller = String(teller);
+
         $.ajax({
             method:'put',
             url: "{{ route('khazanah.updatekelulusan') }}",
@@ -331,7 +334,8 @@
                 "pelulus" : pelulus,
                 "siri" : siri,
                 'komen' : komen,
-                'namakhazanah' : namakhazanah
+                'namakhazanah' : namakhazanah,
+                'teller' : teller
             },
             success:function(data){
                 Swal.fire({