diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index d72f8b8..70ea0b9 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -679,6 +679,8 @@ class TransactionOnlineController extends Controller ->when($request->filled('norujukan'), function ($query) use($request) { return $query->where('norujukan', $request->norujukan); }) + ->orderBy('tarikh', 'desc') + ->orderBy('masa', 'desc') ->get() ->filter(fn ($x) => $x['status'] === 'PAID') ->when($isGroupByNorujukan, function ($query) { @@ -689,8 +691,9 @@ class TransactionOnlineController extends Controller $transaction = Transaction::whereDate('created_at', $date) ->where('teller', 'Online') ->when($request->norujukan, function ($query) use($request) { - return $query->where('norujukan', $request->norujukan); + return $query->where('norujukan', 'like', '%' . $request->norujukan . '%'); }) + ->orderBy('created_at', 'desc') ->get() ->when($isGroupByNorujukan, function ($query) { return $query->groupBy('norujukan')->sortKeysDesc(); @@ -701,6 +704,7 @@ class TransactionOnlineController extends Controller ->when($request->norujukan, function ($query) use($request) { return $query->where('norujukan', $request->norujukan); }) + ->orderBy('tarikh_bayaran', 'desc') ->get() ->when($isGroupByNorujukan, function ($query) { return $query->groupBy('norujukan')->sortKeysDesc(); @@ -716,6 +720,7 @@ class TransactionOnlineController extends Controller ->all(); $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()