antv/thankcard-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: display sender/receiver name, email, department in transaction history

Browse Source
This commit is contained in:
antv
2026-07-09 09:48:47 +07:00
parent 3a33c86346
commit 54048bb4ff
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Admin/AdminService.php
+2 -1
View File
@@ -85,7 +85,8 @@ class AdminService implements AdminServiceInterface
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
return Administration::where('msnv', $msnv)
return Administration::with(['senderUser', 'receiverUser'])
->where('msnv', $msnv)
->whereBetween('date', [$startOfMonth, $endOfMonth])
->orderBy('date', 'desc')
->paginate(10)
app/Services/User/UserService.php
+2 -1
View File
@@ -18,7 +18,8 @@ class UserService implements UserServiceInterface
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
return Administration::where('msnv', $user->msnv)
return Administration::with(['senderUser', 'receiverUser'])
->where('msnv', $user->msnv)
->whereBetween('date', [$startOfMonth, $endOfMonth])
->orderBy('date', 'desc')
->paginate(10)