update laporan pendahuluan dan serahan

2025-03-09 13:27:51 +08:00
parent 578916cfc3
commit 50ff6a16f8
1 changed files with 20 additions and 2 deletions
@@ -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);