diff --git a/app/Http/Controllers/Sales/SalesDashboardController.php b/app/Http/Controllers/Sales/SalesDashboardController.php index 9b2c7ee9..ed15843b 100644 --- a/app/Http/Controllers/Sales/SalesDashboardController.php +++ b/app/Http/Controllers/Sales/SalesDashboardController.php @@ -273,6 +273,20 @@ private function getDashboardData(Request $request): array // 총 예상 수당 (지급 완료 제외) $totalExpectedCommission = $expectedFromDevInProgress + $expectedFromHandover; + // 지급대상 개발비 총액 (개발 진행 중 + 인계 완료 중 지급 미완료) + // 지급 완료된 건의 개발비는 제외 + $paidManagementIds = $myCommissionsAsPartner + ->where('status', SalesCommission::STATUS_PAID) + ->pluck('management_id') + ->toArray(); + $unpaidHandoverRegFee = SalesContractProduct::whereIn('management_id', $handoverManagementIds) + ->whereNotIn('management_id', $paidManagementIds) + ->sum('registration_fee'); + $targetDevelopmentFee = $devInProgressRegFee + $unpaidHandoverRegFee; + + // stats 업데이트 + $stats['target_development_fee'] = $targetDevelopmentFee; + // 1차/2차 수당 지급 현황 계산 (예상 수당 기반) $commissionSummary = $this->calculateExpectedCommissionSummary( $myCommissionsAsPartner, diff --git a/resources/views/sales/dashboard/partials/stats.blade.php b/resources/views/sales/dashboard/partials/stats.blade.php index 361ba62f..ab9840f3 100644 --- a/resources/views/sales/dashboard/partials/stats.blade.php +++ b/resources/views/sales/dashboard/partials/stats.blade.php @@ -44,15 +44,15 @@

{{ $tenantStats['total_tenants'] ?? 0 }}

- {{-- 총 개발비 --}} + {{-- 지급대상 개발비 --}}
- 총 개발비 + 지급대상 개발비
-

{{ number_format($stats['total_membership_fee'] ?? 0) }}

+

{{ number_format($stats['target_development_fee'] ?? 0) }}

{{-- 내 예상 수당 합계 --}}