KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in izzati-feat-laporan-pendahuluan-serahan (pull request #274)

Browse Source 
tambah serahan lelong
This commit is contained in:
izzati zulkifli
2025-03-12 02:36:46 +00:00
parent 0a31ad5e69 245115ea8c
commit ca3dfe87b0
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PendahuluanSerahanController.php
+20 -9
View File
@@ -94,15 +94,18 @@ class PendahuluanSerahanController extends Controller
->where('pendahuluan','>',0) ->where('pendahuluan','>',0)
->orderby('tarikh','desc') ->orderby('tarikh','desc')
->get(); ->get();
}else if($request->jenis == 'serahan'){ }else if($request->jenis == 'serahan'){
$gldetail = GlDetail::on($cawangan['mysql'])
$gldetail=GlDetail::on($cawangan['mysql']) ->where('kodcaw', '=', $kodcaw)
->where('kodcaw','=',$kodcaw) ->whereBetween('tarikh', [$request->mula, $request->hingga])
->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) ->where(function ($query) {
->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%') $query->where('descpt', 'NOT LIKE', 'SERAHAN BAYAR ONLINE%')
->where('serahan','>',0) ->where('descpt', 'NOT LIKE', 'SERAHAN LELONG%'); // Using AND instead of OR
->orderby('tarikh','desc') })
->get(); ->where('serahan', '>', 0)
->orderBy('tarikh', 'desc')
->get();
}else if($request->jenis == 'online'){ }else if($request->jenis == 'online'){
$gldetail=GlDetail::on($cawangan['mysql']) $gldetail=GlDetail::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw) ->where('kodcaw','=',$kodcaw)
@@ -111,6 +114,14 @@ class PendahuluanSerahanController extends Controller
->where('serahan','>',0) ->where('serahan','>',0)
->orderby('tarikh','desc') ->orderby('tarikh','desc')
->get(); ->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'){ }else if($request->jenis == 'serahanonline'){
$gldetail = GlDetail::on($cawangan['mysql']) $gldetail = GlDetail::on($cawangan['mysql'])
->where('kodcaw', '=', $kodcaw) ->where('kodcaw', '=', $kodcaw)