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 @@