Add filter cawangan to transaction online trail
This commit is contained in:
@@ -38,6 +38,9 @@ class TransactionOnlineTrailController extends Controller
|
||||
$endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString();
|
||||
|
||||
$transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate])
|
||||
->when($request->filled('branch'), function ($query) use ($request) {
|
||||
return $query->where('kodcaw', $request->branch);
|
||||
})
|
||||
->when($request->filled('billplzBillId'), function ($query) use ($request) {
|
||||
return $query->where('billplz_id', $request->billplzBillId);
|
||||
})
|
||||
@@ -48,6 +51,9 @@ class TransactionOnlineTrailController extends Controller
|
||||
|
||||
if ($transactionOnline->isEmpty()) {
|
||||
$transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate])
|
||||
->when($request->filled('branch'), function ($query) use ($request) {
|
||||
return $query->where('kodcaw', $request->branch);
|
||||
})
|
||||
->when($request->filled('norujukan'), function ($query) use ($request) {
|
||||
return $query->where('norujukan', 'LIKE', '%' . $request->norujukan . '%');
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user