laporan fix

app/Http/Controllers/KhazanahController.php

@@ -842,7 +842,6 @@ class KhazanahController extends Controller
             'recno' => intval($recnopanjar)
           ]);
 
-        dd($denopanjar->getStatusCode());
         $upVault = $updateVault->getStatusCode();
         $upDeno = $denominasicreate->getStatusCode();
         $updenopanjar = $denopanjar->getStatusCode();
@@ -864,6 +863,7 @@ class KhazanahController extends Controller
 
             return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
         }else{
+
             return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.');
         }
 
@@ -876,34 +876,9 @@ class KhazanahController extends Controller
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
-        $bakiperubatan = 0;
+        
+        $denopanjar = Http::get( config('api.url') .'/api/requestdenopanjar/get/'. $auth_user['cawangan'],['recno' => $request->recno ])->json();
 
-        switch ($request->jenismodal) {
-            case "selenggara":
-                $kategori = "Baiki dan Selenggara";
-                $tag = 2;
-               break;
-            case "keraian":
-                $kategori = "Keraian & Promosi";
-                $tag = 3;
-               break;
-            case "belanjaam":
-                $kategori = "Belanja AM";
-                $tag = 1;
-               break;
-            case "perubatan":
-                $kategori = "Belanja AM - Perubatan";
-                $tag = 1;
-               break;
-            case "dapur":
-                $kategori = "Belanja AM - Barangan Dapur";
-                $tag = 1;
-               break;
-            case "pos":
-                $kategori = "Belanja AM - Postage";
-                $tag = 1;
-               break;
-          }
 
         $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
         
@@ -920,18 +895,18 @@ class KhazanahController extends Controller
         $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
 
         //Tolok Rekod 
-        $rekodsen1 += intval($request->ambilansen1);
-        $rekodsen5 += intval($request->ambilansen5);
-        $rekodsen10 += intval($request->ambilansen10);
-        $rekodsen20 += intval($request->ambilansen20);
-        $rekodsen50 += intval($request->ambilansen50);
+        $rekodsen1 += intval($denopanjar['txtsen1']);
+        $rekodsen5 += intval($denopanjar['txtsen5']);
+        $rekodsen10 += intval($denopanjar['txtsen10']);
+        $rekodsen20 += intval($denopanjar['txtsen20']);
+        $rekodsen50 += intval($denopanjar['txtsen50']);
 
-        $rekodring1 += intval($request->ambilanring1);
-        $rekodring5 += intval($request->ambilanring5); 
-        $rekodring10 += intval($request->ambilanring10);
-        $rekodring20 += intval($request->ambilanring20);
-        $rekodring50 += intval($request->ambilanring50);
-        $rekodring100 += intval($request->ambilanring100);
+        $rekodring1 += intval($denopanjar['txtring1']);
+        $rekodring5 += intval($denopanjar['txtring5']); 
+        $rekodring10 += intval($denopanjar['txtring10']);
+        $rekodring20 += intval($denopanjar['txtring20']);
+        $rekodring50 += intval($denopanjar['txtring50']);
+        $rekodring100 += intval($denopanjar['txtring100']);
 
         $denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
             'bd1' => $rekodb1,
@@ -960,20 +935,12 @@ class KhazanahController extends Controller
         $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
         $tarikhbil = $myDateTime->format('dmY');
 
-        $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
-            'deskripsi' => $request->deskripsi,
-            'bayaran' => $request->bayaran,
-            'tag' => $tag,
-            'kategori' => $kategori,
-            'id' => $auth_user['name'],
-            'bakiperubatan' => $bakiperubatan,
-            'nobaucer' => $request->baucer,
-            'nobil' => $tarikhbil,
-            'tuntutoleh' => $request->tuntutan    
+        $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[
+            'recno' => $request->recno    
         ])->json();
 
-        $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[
-            'totpanjar'=>$request->bayaran
+        $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[
+            'totpanjar'=>$$denopanjar['serahan']
         ]);
 
         $rekodsen1 -= intval($request->ambilansen1);

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>