From 50ff6a16f8c4b73d87634d1a4b53e1be44c7c20b Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Sun, 9 Mar 2025 13:27:51 +0800 Subject: [PATCH] update laporan pendahuluan dan serahan --- .../PendahuluanSerahanController.php | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php index 4f66d96..1c7be85 100644 --- a/app/Http/Controllers/PendahuluanSerahanController.php +++ b/app/Http/Controllers/PendahuluanSerahanController.php @@ -103,7 +103,7 @@ class PendahuluanSerahanController extends Controller ->where('serahan','>',0) ->orderby('tarikh','desc') ->get(); - }else{ + }else if($request->jenis == 'online'){ $gldetail=GlDetail::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) @@ -111,7 +111,25 @@ class PendahuluanSerahanController extends Controller ->where('serahan','>',0) ->orderby('tarikh','desc') ->get(); - } + }else if($request->jenis == 'serahanonline'){ + $gldetail = GlDetail::on($cawangan['mysql']) + ->where('kodcaw', '=', $kodcaw) + ->whereBetween('tarikh', [$request->mula, $request->hingga]) + ->where(function ($query) { + $query->where('descpt', 'LIKE', 'SERAHAN%') + ->orWhere('descpt', 'LIKE', 'Serahan%') + ->orWhere('descpt', 'LIKE', 'serahan%'); // Add more variations if needed + }) + ->where('serahan', '>', 0) + ->orderBy('tarikh', 'desc') + ->get(); + }else{ + $gldetail = GlDetail::on($cawangan['mysql']) + ->where('kodcaw', '=', $kodcaw) + ->whereBetween('tarikh', [$request->mula, $request->hingga]) + ->orderBy('tarikh', 'desc') + ->get(); + } return response()->json($gldetail,200);