diff --git a/app/Services/Admin/AdminService.php b/app/Services/Admin/AdminService.php index b004add..b148cf0 100644 --- a/app/Services/Admin/AdminService.php +++ b/app/Services/Admin/AdminService.php @@ -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) diff --git a/app/Services/User/UserService.php b/app/Services/User/UserService.php index 53b7d7f..a20796a 100644 --- a/app/Services/User/UserService.php +++ b/app/Services/User/UserService.php @@ -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) diff --git a/resources/views/components/transaction-history.blade.php b/resources/views/components/transaction-history.blade.php index f6a01a4..6d8e1ab 100644 --- a/resources/views/components/transaction-history.blade.php +++ b/resources/views/components/transaction-history.blade.php @@ -47,9 +47,43 @@ @if($isReceiver) - {{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}{{ $admin_record->sender }} + @if($admin_record->senderUser) + {{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}{{ $admin_record->senderUser->name }} +
+ {{ $admin_record->senderUser->mail }} • + @php + $deptVal = $admin_record->senderUser->departments; + if (is_numeric($deptVal)) { + $idx = ((int)$deptVal) - 1; + $deptName = config('constants.DEPARTMENTS')[$idx] ?? 'Team'; + } else { + $deptName = $deptVal ?? 'Team'; + } + @endphp + {{ $deptName }} +
+ @else + {{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}{{ $admin_record->sender }} + @endif @else - {{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}{{ $admin_record->receiver }} + @if($admin_record->receiverUser) + {{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}{{ $admin_record->receiverUser->name }} +
+ {{ $admin_record->receiverUser->mail }} • + @php + $deptVal = $admin_record->receiverUser->departments; + if (is_numeric($deptVal)) { + $idx = ((int)$deptVal) - 1; + $deptName = config('constants.DEPARTMENTS')[$idx] ?? 'Team'; + } else { + $deptName = $deptVal ?? 'Team'; + } + @endphp + {{ $deptName }} +
+ @else + {{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}{{ $admin_record->receiver }} + @endif @endif