From 1720537632fba7c0a01ef3f0ff26d5bf706da42d Mon Sep 17 00:00:00 2001
From: aiman <aiman.mazlan@pkb.net.my>
Date: Wed, 15 Oct 2025 14:52:08 +0800
Subject: [PATCH] Filter bakiLelong with kodlaluan and re-adjust the laporan
 aliran tunai teller

---
 .../Controllers/AliranTunaiController.php     |  3 +-
 .../laporan/laporanalirantunai.blade.php      | 66 +++++++++++--------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 6de64fc..06b0820 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -663,7 +663,8 @@ class AliranTunaiController extends Controller
         $teller = $auth_user['name'];
 
         $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[
-            'tarikh' => $tarikh
+            'tarikh' => $tarikh,
+            'kodlaluan' => $auth_user['name']
         ])->json();
 
         $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[
diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php
index 24ae663..2334ec2 100644
--- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php
+++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php
@@ -160,29 +160,38 @@
 
 <table id="scan">
   <tr>
-    <th colspan ="5"><b>LAPORAN ALIRAN TUNAI TELLER (arOS v3)</b></th>
-    <th> </th>
-    <th> </th>
-    <th><b> Tarikh Cetak:</b>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
+     <th colspan="3" style="
+      text-align: left;
+      font-size: 16px;
+      font-weight: bold;
+      text-transform: uppercase;
+      padding-top: 10px;
+      padding-bottom: 10px;
+      letter-spacing: 0.5px;
+    ">
+      LAPORAN ALIRAN TUNAI TELLER
     </th>
-    <th></th>
   </tr>
+  
+   <tr>
+    <td style="width:100px"><b>TARIKH:</b></td>
+    <td><b>
+      @php 
+        $tarikhTeller = DateTime::createFromFormat('Y-m-d', $tunai['tarikh']);
+        echo $tarikhTeller->format('d-m-Y');
+      @endphp
+    </b></td>
+  </tr>
+
   <tr>
-    <td style="width:10px"> <b>TARIKH</b></td>
-    <td><b>{{ $tunai['tarikh'] }}</b></td>
-    <td style="width:50px">   
-    </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
+    <td><b>TARIKH CETAK:</b></td>
+    <td><b>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo $formattedweddingdate;
+      @endphp
+    </b></td>
   </tr>
 </table>
 
@@ -245,13 +254,18 @@
     <td>RM {{ number_format($jumlahTolak,2) }}</td>
   </tr>
 
+  <tr><th>BAKI AKHIR</th></tr>
   <tr>
-    <th>BAKI AKHIR</th>
-  </tr>
-  <tr>
-    <td>Baki Akhir Teller</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['bakiawal'] +$jumlahTambah + $jumlahTolak,2) }}</td>
+    <td colspan="3" style="
+        border: 2px solid black;
+        text-align: center;
+        background-color: #f8f8f8;
+        font-weight: bold;
+        font-size: 13px;
+        padding: 10px;
+    ">
+      BAKI AKHIR TELLER: RM {{ number_format($tunai['bakiawal'] + $jumlahTambah - $jumlahTolak,2) }}
+    </td>
   </tr>
 
 </table>