From e993eb5a0a6eb0da2892a29dbc7a7fc072618522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Sat, 31 Jan 2026 20:31:11 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EA=B0=9C=EB=B0=9C=20=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - salesPartner.user eager loading 추가로 영업자명 표시 - 대표자명(representative_name) 정보 추가 표시 - pending/progress/completed 목록 모두 동일하게 적용 Co-Authored-By: Claude Opus 4.5 --- app/Services/Sales/SalesDevelopmentApprovalService.php | 8 ++++---- .../sales/development/partials/completed-list.blade.php | 4 +++- .../sales/development/partials/pending-list.blade.php | 4 +++- .../sales/development/partials/progress-list.blade.php | 4 +++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Services/Sales/SalesDevelopmentApprovalService.php b/app/Services/Sales/SalesDevelopmentApprovalService.php index b597e1bf..33aa7098 100644 --- a/app/Services/Sales/SalesDevelopmentApprovalService.php +++ b/app/Services/Sales/SalesDevelopmentApprovalService.php @@ -65,7 +65,7 @@ public function getStats(): array public function getPendingApprovals(?string $search = null, int $perPage = 10): LengthAwarePaginator { $query = SalesTenantManagement::query() - ->with(['tenant', 'salesPartner', 'manager']) + ->with(['tenant', 'salesPartner.user', 'manager']) ->where('sales_progress', 100) ->where('manager_progress', 100) ->where('hq_status', SalesTenantManagement::HQ_STATUS_PENDING); @@ -96,7 +96,7 @@ public function getInProgressItems(?string $search = null, int $perPage = 10): L ]; $query = SalesTenantManagement::query() - ->with(['tenant', 'salesPartner', 'manager']) + ->with(['tenant', 'salesPartner.user', 'manager']) ->where('sales_progress', 100) ->where('manager_progress', 100) ->whereIn('hq_status', $progressStatuses); @@ -118,7 +118,7 @@ public function getInProgressItems(?string $search = null, int $perPage = 10): L public function getCompletedItems(?string $search = null, int $perPage = 10): LengthAwarePaginator { $query = SalesTenantManagement::query() - ->with(['tenant', 'salesPartner', 'manager']) + ->with(['tenant', 'salesPartner.user', 'manager']) ->where('hq_status', SalesTenantManagement::HQ_STATUS_HANDOVER); // 검색 @@ -209,7 +209,7 @@ public function getDetail(int $id): SalesTenantManagement { return SalesTenantManagement::with([ 'tenant', - 'salesPartner', + 'salesPartner.user', 'manager', 'contractProducts.product', ])->findOrFail($id); diff --git a/resources/views/sales/development/partials/completed-list.blade.php b/resources/views/sales/development/partials/completed-list.blade.php index 7de90bac..f4105b2c 100644 --- a/resources/views/sales/development/partials/completed-list.blade.php +++ b/resources/views/sales/development/partials/completed-list.blade.php @@ -18,7 +18,9 @@
{{ $companyName }}
-
{{ $tenant?->business_number ?? '-' }}
+
+ {{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }} +
diff --git a/resources/views/sales/development/partials/pending-list.blade.php b/resources/views/sales/development/partials/pending-list.blade.php index 29c6ab3c..fc364862 100644 --- a/resources/views/sales/development/partials/pending-list.blade.php +++ b/resources/views/sales/development/partials/pending-list.blade.php @@ -18,7 +18,9 @@
{{ $companyName }}
-
{{ $tenant?->business_number ?? '-' }}
+
+ {{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }} +
{{ $item->updated_at->format('m/d') }}
diff --git a/resources/views/sales/development/partials/progress-list.blade.php b/resources/views/sales/development/partials/progress-list.blade.php index a8de2507..81f8d5cd 100644 --- a/resources/views/sales/development/partials/progress-list.blade.php +++ b/resources/views/sales/development/partials/progress-list.blade.php @@ -19,7 +19,9 @@
{{ $companyName }}
-
{{ $tenant?->business_number ?? '-' }}
+
+ {{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }} +
{{ $item->updated_at->format('m/d') }}