From a42d36f69bc4a803befbc67a398d0d9d4844cace Mon Sep 17 00:00:00 2001
From: aiman <aiman.mazlan@pkb.net.my>
Date: Tue, 14 Oct 2025 15:55:24 +0800
Subject: [PATCH] Enable datepicker, new route for laporan aliran tunai teller

---
 app/Http/Controllers/LelongController.php | 18 +++++-------------
 app/Http/Controllers/TunaiController.php  | 15 +++++++++++++++
 routes/web.php                            |  2 ++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index b583cc1..ebbac29 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1976,29 +1976,21 @@ class LelongController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
 
-        $date = $request->query('date', Carbon::now()->toDateString());
-
-        try {
-            $parsedDate = Carbon::parse($date)->toDateString();
-        } catch (\Exception $e) {
-            return response()->json(['error' => 'Invalid date format. Use YYYY-MM-DD.'], 400);
-        }
+        $date = $request->tarikh;
 
         $rugiLelong = TuntutBaki::on($cawangan['mysql'])
-                    ->whereDate('tarikh', $parsedDate)
+                    ->whereDate('tarikh', $date)
                     ->where('jumlah', '<', 0)
                     ->sum('jumlah');
 
         $bakiLelong = TuntutBaki::on($cawangan['mysql'])
-                    ->whereDate('tarikh', $parsedDate)
+                    ->whereDate('tarikh', $date)
                     ->where('jumlah', '>', 0)
                     ->sum('jumlah');
-
-        // dd($parsedDate, $rugiLelong, $bakiLelong);
         
         return response()->json([
-                'tarikh' => $parsedDate,
-                'kod_cawangan' => $kodcaw,
+                'tarikh' => $date,
+                'cawangan' => $kodcaw,
                 'rugi_lelong' => $rugiLelong,
                 'baki_lelong' => $bakiLelong
             ], 200);
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index cd4d83f..12d0fba 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -165,6 +165,21 @@ class TunaiController extends Controller
 
     }
 
+    public function getTunaiByTarikh(Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $tunai = Tunai::on($cawangan['mysql'])
+        ->where([['kodcaw','=',$request->kodcaw],
+                 ['tarikh','=',$request->tarikh],
+                 ['kodlaluan','=',$request->kodlaluan]
+                ])
+        ->orderBy('tarikh','desc')
+        ->first();
+
+        return response()->json($tunai);
+    }
+
     public function getTunaiPast($kodcaw,Request $request)
     {
 
diff --git a/routes/web.php b/routes/web.php
index 2b96904..bf0dfe3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -376,6 +376,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']);
     $router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']);
 
+    //Get Tunai By tarikh for Laporan Aliran Tunai Teller
+    $router->get('getTunaiByTarikh', ['uses' => 'TunaiController@getTunaiByTarikh']);
 
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);