laporan fix

resources/views/khazanah/laporan/petibesi.blade.php

@@ -44,6 +44,12 @@
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
 
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
     var tablecustomers = $('#myTable').DataTable({
         "ordering": false
     });

resources/views/khazanah/panjar.blade.php

@@ -163,7 +163,7 @@
                         panjar['deskripsi'],
                         panjar['kategori'],
                         panjar['bayaran'],
-                        '<button onclick="deletepanjar();" class="btn btn-danger fas fa-trash-alt"></button>'
+                        '<button onclick="deletepanjar(this);" data-recno="' + panjar['recno'] + '" class="btn btn-danger fas fa-trash-alt"></button>'
                     ]).draw();
                     counter = counter + 1;
            
@@ -171,8 +171,10 @@
         
     }
 
-    function deletepanjar()
+    function deletepanjar(e)
     {
+        let rec_no = $(e).data('recno');
+
         Swal.fire({
             title: 'Adakah anda pasti?',
             text: "Anda tidak dapat untuk mengembalinya kembali!",

resources/views/print/laporan_penebusan.blade.php

@@ -322,8 +322,8 @@
     <td> Not Applicable </td>
   </tr>
   <tr>
-    <td>{{ $upahlama['bil'] }}</td>
-    <td>Ansuran</td>
+    <td>{{ $ansuran['bilangan'] }}</td>
+    <td>Ansuran Pembiayaan</td>
     <td>{{ number_format($ansuran['totalpendahuluan'],2) }}</td>
     <td>{{ number_format($ansuran['totalkeuntungan'],2) }}</td>
     <td> Not Applicable </td>

resources/views/print/laporan_petibesi.blade.php

@@ -211,7 +211,7 @@
     <th>TOLAK</th>
   </tr>
   <tr>
-    <td>Serahan Kepada Teller</td>
+    <td>Pendahuluan Kepada Teller</td>
     <td>:</td>
     <td>RM {{ number_format($petibesi['keluar'],2) }}</td>
   </tr>
@@ -226,7 +226,7 @@
     <th>TAMBAH</th>
   </tr>
   <tr>
-    <td>Pendahuluan Daripada Teller</td>
+    <td>Serahan Daripada Teller</td>
     <td>:</td>
     <td>RM {{ number_format($petibesi['masuk'],2) }}</td>
   </tr>

resources/views/print/laporan_ringkasanharian.blade.php

@@ -191,8 +191,10 @@
       <div class="col-12">
         <p><b>G) BAYAR BAKI LELONG</b></p>
       </div>
-      <div class="col-6">RM</div>
+      <div class="col-6">1. BAKI LELONG</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}</div>
+      <div class="col-6">2. RUGI LELONG</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
     </div>
   </div>
 </div>

resources/views/print/laporan_ringkasanterkumpulv2.blade.php

@@ -114,8 +114,10 @@
       <div class="col-12">
         <p><b>G) BAYAR BAKI LELONG</b></p>
       </div>
-      <div class="col-6">RM</div>
-      <div class="col-6"></div>
+      <div class="col-6">1. BAKI LELONG</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}</div>
+      <div class="col-6">2. RUGI LELONG</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
     </div>
   </div>
 </div>