From 04bc76ef89d92869a6aa53fc2b086b0753e3e1a8 Mon Sep 17 00:00:00 2001 From: aiman Date: Sun, 12 Oct 2025 12:38:00 +0800 Subject: [PATCH 1/3] Add Baki Lelong for laporan aliran tunai teller --- app/Http/Controllers/LelongController.php | 32 +++++++++++++++++++++++ routes/web.php | 2 ++ 2 files changed, 34 insertions(+) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index ce7709e..b583cc1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1972,4 +1972,36 @@ class LelongController extends Controller return response()->json($arrayblm); } + public function getBakiLelongByTeller($kodcaw, Request $request) + { + $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); + } + + $rugiLelong = TuntutBaki::on($cawangan['mysql']) + ->whereDate('tarikh', $parsedDate) + ->where('jumlah', '<', 0) + ->sum('jumlah'); + + $bakiLelong = TuntutBaki::on($cawangan['mysql']) + ->whereDate('tarikh', $parsedDate) + ->where('jumlah', '>', 0) + ->sum('jumlah'); + + // dd($parsedDate, $rugiLelong, $bakiLelong); + + return response()->json([ + 'tarikh' => $parsedDate, + 'kod_cawangan' => $kodcaw, + 'rugi_lelong' => $rugiLelong, + 'baki_lelong' => $bakiLelong + ], 200); + } + } diff --git a/routes/web.php b/routes/web.php index 0f81536..2b96904 100644 --- a/routes/web.php +++ b/routes/web.php @@ -194,6 +194,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']); + $router->get('lelong/bakilelongbyteller/{kodcaw}',['uses' => 'LelongController@getBakiLelongByTeller']); + //Marhun API From a42d36f69bc4a803befbc67a398d0d9d4844cace Mon Sep 17 00:00:00 2001 From: aiman Date: Tue, 14 Oct 2025 15:55:24 +0800 Subject: [PATCH 2/3] 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']); From ece4210134aab112de21eea88133374b27bc74b4 Mon Sep 17 00:00:00 2001 From: aiman Date: Wed, 15 Oct 2025 14:55:26 +0800 Subject: [PATCH 3/3] Filter bakiLelong by kodlaluan teller --- app/Http/Controllers/LelongController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index ebbac29..96529eb 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1981,11 +1981,13 @@ class LelongController extends Controller $rugiLelong = TuntutBaki::on($cawangan['mysql']) ->whereDate('tarikh', $date) ->where('jumlah', '<', 0) + ->where('teller','=', $request->kodlaluan) ->sum('jumlah'); $bakiLelong = TuntutBaki::on($cawangan['mysql']) ->whereDate('tarikh', $date) ->where('jumlah', '>', 0) + ->where('teller','=', $request->kodlaluan) ->sum('jumlah'); return response()->json([