From a5c5d8c1c917da8fb94d1176e32c1a860c2e6541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Mon, 2 Feb 2026 20:09:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EC=98=81=EC=97=85=ED=8C=8C=ED=8A=B8?= =?UTF-8?q?=EB=84=88=20=EA=B3=A0=EA=B0=9D=EA=B4=80=EB=A6=AC=EC=97=90=20?= =?UTF-8?q?=EC=88=98=EB=8B=B9=20=EC=A7=80=EA=B8=89=20=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 1차 납입완료, 1차 수당지급 컬럼 추가 - 2차 납입완료, 2차 수당지급 컬럼 추가 - 매니저 수당지급 컬럼 추가 - 컨트롤러에서 commission 정보 로드 Co-Authored-By: Claude Opus 4.5 --- .../Sales/AdminProspectController.php | 9 ++++ .../partials/content.blade.php | 47 ++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Sales/AdminProspectController.php b/app/Http/Controllers/Sales/AdminProspectController.php index ead104c8..d8b38b4d 100644 --- a/app/Http/Controllers/Sales/AdminProspectController.php +++ b/app/Http/Controllers/Sales/AdminProspectController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Sales; use App\Http\Controllers\Controller; +use App\Models\Sales\SalesCommission; use App\Models\Sales\SalesScenarioChecklist; use App\Models\Sales\SalesTenantManagement; use App\Models\Sales\TenantProspect; @@ -136,6 +137,14 @@ private function getIndexData(Request $request): array $prospect->hq_status = $management?->hq_status ?? 'pending'; $prospect->hq_status_label = $management?->hq_status_label ?? '대기'; $prospect->manager_user = $management?->manager; + + // 수당 정보 (management가 있는 경우) + if ($management) { + $commission = SalesCommission::where('management_id', $management->id)->first(); + $prospect->commission = $commission; + } else { + $prospect->commission = null; + } } // 전체 통계 diff --git a/resources/views/sales/admin-prospects/partials/content.blade.php b/resources/views/sales/admin-prospects/partials/content.blade.php index 92c1530e..dfb20e35 100644 --- a/resources/views/sales/admin-prospects/partials/content.blade.php +++ b/resources/views/sales/admin-prospects/partials/content.blade.php @@ -84,6 +84,11 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none foc 담당 매니저 영업 진행률 매니저 진행률 + 1차 납입 + 1차 수당 + 2차 납입 + 2차 수당 + 매니저 수당 개발 상태 상태 등록일 @@ -127,6 +132,46 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none foc {{ $prospect->manager_progress }}% + {{-- 1차 납입완료 --}} + + @if($prospect->commission?->first_payment_at) + {{ $prospect->commission->first_payment_at->format('m/d') }} + @else + - + @endif + + {{-- 1차 파트너 수당지급 --}} + + @if($prospect->commission?->first_partner_paid_at) + {{ $prospect->commission->first_partner_paid_at->format('m/d') }} + @else + - + @endif + + {{-- 2차 납입완료 --}} + + @if($prospect->commission?->second_payment_at) + {{ $prospect->commission->second_payment_at->format('m/d') }} + @else + - + @endif + + {{-- 2차 파트너 수당지급 --}} + + @if($prospect->commission?->second_partner_paid_at) + {{ $prospect->commission->second_partner_paid_at->format('m/d') }} + @else + - + @endif + + {{-- 매니저 수당지급 --}} + + @if($prospect->commission?->manager_paid_at) + {{ $prospect->commission->manager_paid_at->format('m/d') }} + @else + - + @endif +