diff --git a/app/Http/Controllers/Sales/SalesDashboardController.php b/app/Http/Controllers/Sales/SalesDashboardController.php index 011fb592..20dbe357 100644 --- a/app/Http/Controllers/Sales/SalesDashboardController.php +++ b/app/Http/Controllers/Sales/SalesDashboardController.php @@ -674,7 +674,7 @@ private function calculatePartnerSummaryStats(array $partnerIds, int $currentUse ->where('status', SalesCommission::STATUS_APPROVED) ->sum('manager_commission'); - // 납입대기 = 총 예상 - 지급완료 - 지급예정 + // 입금대기 = 총 예상 - 지급완료 - 지급예정 $pendingManagerCommission = max(0, $expectedCommission - $paidManagerCommission - $scheduledManagerCommission); // 1차/2차 분할 (각 50%) @@ -958,7 +958,7 @@ private function calculateExpectedCommissionSummary($commissions, int $totalExpe ->whereIn('status', [SalesCommission::STATUS_PENDING, SalesCommission::STATUS_APPROVED]) ->sum('partner_commission'); - // 납입대기 금액 = 총 예상 수당 - 지급예정 - 지급완료 + // 입금대기 금액 = 총 예상 수당 - 지급예정 - 지급완료 $pendingAmount = max(0, $totalExpectedCommission - $scheduledAmount - $paidCommission); // 1차/2차 분할 (각 50%) diff --git a/resources/views/sales/dashboard/partials/my-commission.blade.php b/resources/views/sales/dashboard/partials/my-commission.blade.php index b0fb695f..819c3e49 100644 --- a/resources/views/sales/dashboard/partials/my-commission.blade.php +++ b/resources/views/sales/dashboard/partials/my-commission.blade.php @@ -82,7 +82,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700"> {{-- 상태별 금액 --}}
-
납입대기
+
입금대기
{{ number_format($first['pending']) }}원
@@ -120,7 +120,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700"> {{-- 상태별 금액 --}}
-
납입대기
+
입금대기
{{ number_format($second['pending']) }}원
@@ -143,7 +143,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700">

수당 지급 프로세스:

-

납입대기: 고객의 개발비 입금 대기 중

+

입금대기: 고객의 개발비 입금 대기 중

지급예정: 개발비 입금 완료, 익월 10일 수당 지급 예정

지급완료: 수당 지급 완료

diff --git a/resources/views/sales/dashboard/partials/partner-activity.blade.php b/resources/views/sales/dashboard/partials/partner-activity.blade.php index 5a9549a5..7760613d 100644 --- a/resources/views/sales/dashboard/partials/partner-activity.blade.php +++ b/resources/views/sales/dashboard/partials/partner-activity.blade.php @@ -95,7 +95,7 @@ 구분 총액 - 납입대기 + 입금대기 지급예정 지급완료 @@ -149,7 +149,7 @@ - 납입대기 → + 입금대기 → 개발비 입금 → 지급예정 → 익월 10일 → diff --git a/resources/views/sales/dashboard/partials/stats.blade.php b/resources/views/sales/dashboard/partials/stats.blade.php index ef2d8e01..0ff1cdf9 100644 --- a/resources/views/sales/dashboard/partials/stats.blade.php +++ b/resources/views/sales/dashboard/partials/stats.blade.php @@ -95,7 +95,7 @@ class="bg-emerald-50 border border-emerald-200 rounded-lg p-3 text-left hover:bg 구분 총액 - 납입대기 + 입금대기 지급예정 지급완료 @@ -149,7 +149,7 @@ class="bg-emerald-50 border border-emerald-200 rounded-lg p-3 text-left hover:bg - 납입대기 → + 입금대기 → 개발비 입금 → 지급예정 → 익월 10일 →