diff --git a/app/Http/Controllers/Sales/SalesManagerController.php b/app/Http/Controllers/Sales/SalesManagerController.php index 5eb0bc9f..91e354d8 100644 --- a/app/Http/Controllers/Sales/SalesManagerController.php +++ b/app/Http/Controllers/Sales/SalesManagerController.php @@ -347,15 +347,23 @@ public function approvals(Request $request): View|Response return response('', 200)->header('HX-Redirect', route('sales.managers.approvals')); } - $filters = [ - 'search' => $request->get('search'), - 'approval_status' => 'pending', // 승인 대기만 - ]; + $search = $request->get('search'); + + // 승인 대기자 목록 + $pendingPartners = $this->service->getSalesPartners([ + 'search' => $search, + 'approval_status' => 'pending', + ])->paginate(10, ['*'], 'pending_page'); + + // 승인된 파트너 목록 (최근 승인 순) + $approvedPartners = $this->service->getSalesPartners([ + 'search' => $search, + 'approval_status' => 'approved', + ])->reorder()->latest('approved_at')->paginate(10, ['*'], 'approved_page'); - $partners = $this->service->getSalesPartners($filters)->paginate(20); $stats = $this->service->getApprovalStats(); - return view('sales.managers.approvals', compact('partners', 'stats')); + return view('sales.managers.approvals', compact('pendingPartners', 'approvedPartners', 'stats')); } /** diff --git a/resources/views/sales/managers/approvals.blade.php b/resources/views/sales/managers/approvals.blade.php index d5a82c77..f1c87d91 100644 --- a/resources/views/sales/managers/approvals.blade.php +++ b/resources/views/sales/managers/approvals.blade.php @@ -5,7 +5,7 @@ @section('content')
영업파트너 가입 신청을 검토하고 승인/반려합니다
@@ -13,137 +13,227 @@| 신청자 | -아이디 | -역할 | -연락처 | -추천인(유치자) | -신청일 | -처리 | -
|---|---|---|---|---|---|---|
|
- {{ $partner->name }}
- @if($partner->email)
- {{ $partner->email }}
- @endif
- |
- - {{ $partner->user_id ?? '-' }} - | -
-
- @foreach($partner->userRoles as $userRole)
- @php
- $roleColor = match($userRole->role->name ?? '') {
- 'sales' => 'bg-blue-100 text-blue-800',
- 'manager' => 'bg-purple-100 text-purple-800',
- 'recruiter' => 'bg-green-100 text-green-800',
- default => 'bg-gray-100 text-gray-800',
- };
- $roleLabel = match($userRole->role->name ?? '') {
- 'sales' => '영업',
- 'manager' => '매니저',
- 'recruiter' => '유치담당',
- default => $userRole->role->name ?? '-',
- };
- @endphp
-
- {{ $roleLabel }}
-
- @endforeach
-
- |
- - {{ $partner->phone ?? '-' }} - | -- @if($partner->parent) - {{ $partner->parent->name }} - @else - - - @endif - | -- {{ $partner->created_at->format('Y-m-d H:i') }} - | -
-
-
-
-
-
- |
-
| - 승인 대기 중인 영업파트너가 없습니다. - | -||||||
| 신청자 | +역할 | +유치자 | +처리 | +
|---|---|---|---|
|
+ {{ $partner->name }}
+ {{ $partner->user_id ?? $partner->email }}
+ {{ $partner->created_at->format('m/d H:i') }}
+ |
+
+
+ @foreach($partner->userRoles as $userRole)
+ @php
+ $roleColor = match($userRole->role->name ?? '') {
+ 'sales' => 'bg-blue-100 text-blue-800',
+ 'manager' => 'bg-purple-100 text-purple-800',
+ 'recruiter' => 'bg-green-100 text-green-800',
+ default => 'bg-gray-100 text-gray-800',
+ };
+ $roleLabel = match($userRole->role->name ?? '') {
+ 'sales' => '영업',
+ 'manager' => '매니저',
+ 'recruiter' => '유치담당',
+ default => $userRole->role->name ?? '-',
+ };
+ @endphp
+
+ {{ $roleLabel }}
+
+ @endforeach
+
+ |
+ + @if($partner->parent) + {{ $partner->parent->name }} + @else + - + @endif + | +
+
+
+
+
+
+ |
+
| + + 승인 대기 중인 파트너가 없습니다. + | +|||
| 파트너 | +역할 | +유치자 | +승인일 | +상세 | +
|---|---|---|---|---|
|
+ {{ $partner->name }}
+ {{ $partner->user_id ?? $partner->email }}
+ |
+
+
+ @foreach($partner->userRoles as $userRole)
+ @php
+ $roleColor = match($userRole->role->name ?? '') {
+ 'sales' => 'bg-blue-100 text-blue-800',
+ 'manager' => 'bg-purple-100 text-purple-800',
+ 'recruiter' => 'bg-green-100 text-green-800',
+ default => 'bg-gray-100 text-gray-800',
+ };
+ $roleLabel = match($userRole->role->name ?? '') {
+ 'sales' => '영업',
+ 'manager' => '매니저',
+ 'recruiter' => '유치담당',
+ default => $userRole->role->name ?? '-',
+ };
+ @endphp
+
+ {{ $roleLabel }}
+
+ @endforeach
+
+ |
+ + @if($partner->parent) + {{ $partner->parent->name }} + @else + - + @endif + | ++ @if($partner->approved_at) + {{ $partner->approved_at->format('m/d H:i') }} + @else + - + @endif + | ++ + | +
| + + 승인된 파트너가 없습니다. + | +||||