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

Sort online payment trail data in date descending, fix query for gldetail when querying by norujukan

Browse Source
This commit is contained in:
Afiq Hamzah
2024-07-19 10:26:37 +08:00
parent f037dc539a
commit 34204cdd5e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TransactionOnlineController.php
+6 -1
View File
@@ -679,6 +679,8 @@ class TransactionOnlineController extends Controller
->when($request->filled('norujukan'), function ($query) use($request) { ->when($request->filled('norujukan'), function ($query) use($request) {
return $query->where('norujukan', $request->norujukan); return $query->where('norujukan', $request->norujukan);
}) })
->orderBy('tarikh', 'desc')
->orderBy('masa', 'desc')
->get() ->get()
->filter(fn ($x) => $x['status'] === 'PAID') ->filter(fn ($x) => $x['status'] === 'PAID')
->when($isGroupByNorujukan, function ($query) { ->when($isGroupByNorujukan, function ($query) {
@@ -689,8 +691,9 @@ class TransactionOnlineController extends Controller
$transaction = Transaction::whereDate('created_at', $date) $transaction = Transaction::whereDate('created_at', $date)
->where('teller', 'Online') ->where('teller', 'Online')
->when($request->norujukan, function ($query) use($request) { ->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() ->get()
->when($isGroupByNorujukan, function ($query) { ->when($isGroupByNorujukan, function ($query) {
return $query->groupBy('norujukan')->sortKeysDesc(); return $query->groupBy('norujukan')->sortKeysDesc();
@@ -701,6 +704,7 @@ class TransactionOnlineController extends Controller
->when($request->norujukan, function ($query) use($request) { ->when($request->norujukan, function ($query) use($request) {
return $query->where('norujukan', $request->norujukan); return $query->where('norujukan', $request->norujukan);
}) })
->orderBy('tarikh_bayaran', 'desc')
->get() ->get()
->when($isGroupByNorujukan, function ($query) { ->when($isGroupByNorujukan, function ($query) {
return $query->groupBy('norujukan')->sortKeysDesc(); return $query->groupBy('norujukan')->sortKeysDesc();
@@ -717,6 +721,7 @@ class TransactionOnlineController extends Controller
$connectionCawangan = Cawangan::on('mysql7')->whereIn('kodcaw', $cawanganTransactionOnline)->get()->pluck('mysql'); $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()) $glDetail = $connectionCawangan->map(fn ($x) => GlDetail::on($x)->where('teller', 'ONLINE')->whereDate('tarikh', $date)->get())
->flatten() ->flatten()
->when($isGroupByNorujukan, function ($glDetail) { ->when($isGroupByNorujukan, function ($glDetail) {