SamProject/sam-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:납입대기를 입금대기로 용어 수정

Browse Source 
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
김보곤
2026-02-04 13:38:18 +09:00
parent be28b76872
commit ec9d80e3dc
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Sales/SalesDashboardController.php
View File

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

6
resources/views/sales/dashboard/partials/my-commission.blade.php
View File

@@ -82,7 +82,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700">
{{-- 상태별 금액 --}}
<div class="grid grid-cols-3 gap-2 text-center text-xs">
<div class="bg-white/60 rounded-lg p-2">
<div class="text-gray-500 mb-0.5">납입대기</div>
<div class="text-gray-500 mb-0.5">입금대기</div>
<div class="font-semibold text-gray-600">{{ number_format($first['pending']) }}원</div>
</div>
<div class="bg-white/60 rounded-lg p-2">
@@ -120,7 +120,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700">
{{-- 상태별 금액 --}}
<div class="grid grid-cols-3 gap-2 text-center text-xs">
<div class="bg-white/60 rounded-lg p-2">
<div class="text-gray-500 mb-0.5">납입대기</div>
<div class="text-gray-500 mb-0.5">입금대기</div>
<div class="font-semibold text-gray-600">{{ number_format($second['pending']) }}원</div>
</div>
<div class="bg-white/60 rounded-lg p-2">
@@ -143,7 +143,7 @@ class="text-sm text-emerald-600 hover:text-emerald-700">
</svg>
<div>
<p class="mb-1"><strong>수당 지급 프로세스:</strong></p>
<p>• <span class="text-gray-500">납입대기</span>: 고객의 개발비 입금 대기 중</p>
<p>• <span class="text-gray-500">입금대기</span>: 고객의 개발비 입금 대기 중</p>
<p>• <span class="text-amber-600">지급예정</span>: 개발비 입금 완료, 익월 10일 수당 지급 예정</p>
<p>• <span class="text-emerald-600">지급완료</span>: 수당 지급 완료</p>
</div>

4
resources/views/sales/dashboard/partials/partner-activity.blade.php
View File

@@ -95,7 +95,7 @@
<tr class="bg-gray-50 border-b border-gray-200">
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">구분</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-500 uppercase">총액</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-400 uppercase">납입대기</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-400 uppercase">입금대기</th>
<th class="px-4 py-2 text-right text-xs font-medium text-amber-600 uppercase">지급예정</th>
<th class="px-4 py-2 text-right text-xs font-medium text-emerald-600 uppercase">지급완료</th>
</tr>
@@ -149,7 +149,7 @@
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
<span>
<span class="text-gray-500">납입대기</span> →
<span class="text-gray-500">입금대기</span> →
개발비 입금 →
<span class="text-amber-600 font-medium">지급예정</span> →
익월 10일 →

4
resources/views/sales/dashboard/partials/stats.blade.php
View File

@@ -95,7 +95,7 @@ class="bg-emerald-50 border border-emerald-200 rounded-lg p-3 text-left hover:bg
<tr class="bg-gray-50 border-b border-gray-200">
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">구분</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-500 uppercase">총액</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-400 uppercase">납입대기</th>
<th class="px-4 py-2 text-right text-xs font-medium text-gray-400 uppercase">입금대기</th>
<th class="px-4 py-2 text-right text-xs font-medium text-amber-600 uppercase">지급예정</th>
<th class="px-4 py-2 text-right text-xs font-medium text-emerald-600 uppercase">지급완료</th>
</tr>
@@ -149,7 +149,7 @@ class="bg-emerald-50 border border-emerald-200 rounded-lg p-3 text-left hover:bg
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
<span>
<span class="text-gray-500">납입대기</span> →
<span class="text-gray-500">입금대기</span> →
개발비 입금 →
<span class="text-amber-600 font-medium">지급예정</span> →
익월 10일 →