fix pendahuluanserahanbakieloong

2021-11-06 12:28:35 +08:00
parent 3255f56d63
commit ccb79811ff
4 changed files with 118 additions and 39 deletions
@@ -94,7 +94,7 @@ class PendahuluanSerahanController extends Controller
                ->where('pendahuluan','>',0)
                ->orderby('tarikh','desc')
                ->get();
-       }else{
+       }else if($request->jenis == 'serahan'){

            $gldetail=GlDetail::on($cawangan['mysql'])
                ->where('kodcaw','=',$kodcaw)
@@ -103,6 +103,14 @@ class PendahuluanSerahanController extends Controller
                ->where('serahan','>',0)
                ->orderby('tarikh','desc')
                ->get();
+       }else{
+            $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                ->where('descpt','LIKE','SERAHAN BAYAR ONLINE%')
+                ->where('serahan','>',0)
+                ->orderby('tarikh','desc')
+                ->get();
       }