Fix query for gldetail when querying by norujukan

This commit is contained in:
Afiq Hamzah
2024-07-19 11:08:26 +08:00
parent 34204cdd5e
commit 9dd661ddb3
@@ -691,7 +691,7 @@ class TransactionOnlineController extends Controller
$transaction = Transaction::whereDate('created_at', $date)
->where('teller', 'Online')
->when($request->norujukan, function ($query) use($request) {
return $query->where('norujukan', 'like', '%' . $request->norujukan . '%');
return $query->where('norujukan', $request->norujukan);
})
->orderBy('created_at', 'desc')
->get()
@@ -721,7 +721,6 @@ class TransactionOnlineController extends Controller
$connectionCawangan = Cawangan::on('mysql7')->whereIn('kodcaw', $cawanganTransactionOnline)->get()->pluck('mysql');
$glDetail = $connectionCawangan->map(fn ($x) => GlDetail::on($x)->where('teller', 'ONLINE')->whereDate('tarikh', $date)->get())
->flatten()
->when($isGroupByNorujukan, function ($glDetail) {
@@ -732,7 +731,7 @@ class TransactionOnlineController extends Controller
});
})
->when($request->filled('norujukan'), function ($glDetail) use($request) {
return $glDetail->where('norujukan', $request->norujukan);
return $glDetail->filter(fn($x) => strpos($x->descpt, $request->norujukan) !== false);
})
->sortKeysDesc()
->toArray();