feat: display sender/receiver name, email, department in transaction history
This commit is contained in:
@@ -85,7 +85,8 @@ class AdminService implements AdminServiceInterface
|
|||||||
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
||||||
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
||||||
|
|
||||||
return Administration::where('msnv', $msnv)
|
return Administration::with(['senderUser', 'receiverUser'])
|
||||||
|
->where('msnv', $msnv)
|
||||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||||
->orderBy('date', 'desc')
|
->orderBy('date', 'desc')
|
||||||
->paginate(10)
|
->paginate(10)
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ class UserService implements UserServiceInterface
|
|||||||
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
||||||
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
||||||
|
|
||||||
return Administration::where('msnv', $user->msnv)
|
return Administration::with(['senderUser', 'receiverUser'])
|
||||||
|
->where('msnv', $user->msnv)
|
||||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||||
->orderBy('date', 'desc')
|
->orderBy('date', 'desc')
|
||||||
->paginate(10)
|
->paginate(10)
|
||||||
|
|||||||
@@ -47,10 +47,44 @@
|
|||||||
</td>
|
</td>
|
||||||
<td class="px-6 py-3.5 whitespace-nowrap font-bold text-[#1a2b49]">
|
<td class="px-6 py-3.5 whitespace-nowrap font-bold text-[#1a2b49]">
|
||||||
@if($isReceiver)
|
@if($isReceiver)
|
||||||
|
@if($admin_record->senderUser)
|
||||||
|
{{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}<span class="text-[#3462f7]">{{ $admin_record->senderUser->name }}</span>
|
||||||
|
<div class="text-[11px] text-gray-400 font-medium mt-1.5 leading-none">
|
||||||
|
{{ $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 }}
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
{{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}<span class="text-[#3462f7]">{{ $admin_record->sender }}</span>
|
{{ $mode === 'self' ? 'Nhận từ: ' : 'Từ: ' }}<span class="text-[#3462f7]">{{ $admin_record->sender }}</span>
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
|
@if($admin_record->receiverUser)
|
||||||
|
{{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}<span class="text-[#3462f7]">{{ $admin_record->receiverUser->name }}</span>
|
||||||
|
<div class="text-[11px] text-gray-400 font-medium mt-1.5 leading-none">
|
||||||
|
{{ $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 }}
|
||||||
|
</div>
|
||||||
@else
|
@else
|
||||||
{{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}<span class="text-[#3462f7]">{{ $admin_record->receiver }}</span>
|
{{ $mode === 'self' ? 'Gửi cho: ' : 'Tới: ' }}<span class="text-[#3462f7]">{{ $admin_record->receiver }}</span>
|
||||||
@endif
|
@endif
|
||||||
|
@endif
|
||||||
</td>
|
</td>
|
||||||
<td class="px-6 py-3.5 whitespace-nowrap font-extrabold text-base">
|
<td class="px-6 py-3.5 whitespace-nowrap font-extrabold text-base">
|
||||||
@if($isReceiver)
|
@if($isReceiver)
|
||||||
|
|||||||
Reference in New Issue
Block a user