From 245115ea8c73ddec1c4675af3c0124336b425cd0 Mon Sep 17 00:00:00 2001
From: BTMS2 <btms2@BTMS2s-MacBook-Pro.local>
Date: Tue, 11 Mar 2025 09:24:31 +0800
Subject: [PATCH] tambah serahan lelong

---
 .../PendahuluanSerahanController.php          | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php
index 1c7be85..2510cc3 100644
--- a/app/Http/Controllers/PendahuluanSerahanController.php
+++ b/app/Http/Controllers/PendahuluanSerahanController.php
@@ -94,15 +94,18 @@ class PendahuluanSerahanController extends Controller
                 ->where('pendahuluan','>',0)
                 ->orderby('tarikh','desc')
                 ->get();
-       }else if($request->jenis == 'serahan'){
-
-            $gldetail=GlDetail::on($cawangan['mysql'])
-                ->where('kodcaw','=',$kodcaw)
-                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
-                ->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%')
-                ->where('serahan','>',0)
-                ->orderby('tarikh','desc')
-                ->get();
+        }else if($request->jenis == 'serahan'){
+                $gldetail = GlDetail::on($cawangan['mysql'])
+                    ->where('kodcaw', '=', $kodcaw)
+                    ->whereBetween('tarikh', [$request->mula, $request->hingga])
+                    ->where(function ($query) {
+                        $query->where('descpt', 'NOT LIKE', 'SERAHAN BAYAR ONLINE%')
+                              ->where('descpt', 'NOT LIKE', 'SERAHAN LELONG%'); // Using AND instead of OR
+                    })
+                    ->where('serahan', '>', 0)
+                    ->orderBy('tarikh', 'desc')
+                    ->get();
+ 
         }else if($request->jenis == 'online'){
             $gldetail=GlDetail::on($cawangan['mysql'])
                 ->where('kodcaw','=',$kodcaw)
@@ -111,6 +114,14 @@ class PendahuluanSerahanController extends Controller
                 ->where('serahan','>',0)
                 ->orderby('tarikh','desc')
                 ->get();
+        }else if($request->jenis == 'serahanlelong'){
+            $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                ->where('descpt','LIKE','SERAHAN LELONG%')
+                ->where('serahan','>',0)
+                ->orderby('tarikh','desc')
+                ->get();
         }else if($request->jenis == 'serahanonline'){
             $gldetail = GlDetail::on($cawangan['mysql'])
                 ->where('kodcaw', '=', $kodcaw)