diff --git a/app/Http/Controllers/Sales/SalesDashboardController.php b/app/Http/Controllers/Sales/SalesDashboardController.php index a35a6ece..cf111b16 100644 --- a/app/Http/Controllers/Sales/SalesDashboardController.php +++ b/app/Http/Controllers/Sales/SalesDashboardController.php @@ -623,21 +623,47 @@ private function getPartnerActivitiesDetail($recruitedPartners, int $currentUser ->orderBy('created_at', 'desc') ->get(); - // 파트너가 매니저로 참여하는 가망고객 (다른 사람이 등록, 이 파트너가 매니저) + // 파트너가 매니저로 참여하는 건 (다른 사람이 등록, 이 파트너가 매니저) $managerProspects = collect(); - $managerManagements = SalesTenantManagement::where('manager_user_id', $partner->id) + + // 1. prospect 기반 매니저 지정 (가망고객 단계) + $prospectManagements = SalesTenantManagement::where('manager_user_id', $partner->id) ->whereNotNull('tenant_prospect_id') ->with(['tenantProspect.registeredBy']) ->get(); - foreach ($managerManagements as $mgmt) { + foreach ($prospectManagements as $mgmt) { $prospect = $mgmt->tenantProspect; // 본인이 등록한 건은 제외 (이미 allProspects에 포함됨) if ($prospect && $prospect->registered_by !== $partner->id) { $managerProspects->push([ + 'type' => 'prospect', 'prospect' => $prospect, 'management' => $mgmt, 'registeredBy' => $prospect->registeredBy, + 'company_name' => $prospect->company_name, + 'business_number' => $prospect->business_number, + ]); + } + } + + // 2. tenant 기반 매니저 지정 (이미 계약된 테넌트) + $tenantManagements = SalesTenantManagement::where('manager_user_id', $partner->id) + ->whereNull('tenant_prospect_id') + ->whereNotNull('tenant_id') + ->with(['tenant']) + ->get(); + + foreach ($tenantManagements as $mgmt) { + $tenant = $mgmt->tenant; + if ($tenant) { + $managerProspects->push([ + 'type' => 'tenant', + 'tenant' => $tenant, + 'management' => $mgmt, + 'registeredBy' => null, // 테넌트는 등록자 정보 없음 + 'company_name' => $tenant->company_name, + 'business_number' => $tenant->business_number, ]); } } diff --git a/resources/views/sales/dashboard/partials/partner-activity.blade.php b/resources/views/sales/dashboard/partials/partner-activity.blade.php index a3da4a02..ee64b85d 100644 --- a/resources/views/sales/dashboard/partials/partner-activity.blade.php +++ b/resources/views/sales/dashboard/partials/partner-activity.blade.php @@ -279,54 +279,83 @@
{{ $mProspect->company_name }}
-{{ $mProspect->business_number ?? '-' }}
+{{ $mCompanyName }}
+{{ $mBusinessNumber ?? '-' }}