diff --git a/resources/views/finance/settlement/partials/commission/manager-commission-table.blade.php b/resources/views/finance/settlement/partials/commission/manager-commission-table.blade.php index 07a914ae..c6a80ea0 100644 --- a/resources/views/finance/settlement/partials/commission/manager-commission-table.blade.php +++ b/resources/views/finance/settlement/partials/commission/manager-commission-table.blade.php @@ -1,4 +1,4 @@ -{{-- 매니저 수당 테이블 (2행 레이아웃) --}} +{{-- 매니저 수당 테이블 (1행 레이아웃) --}}
@@ -8,8 +8,11 @@ + + + @@ -57,17 +60,18 @@ ]; @endphp - {{-- Row 1: 메인 정보 --}} - + {{-- 테넌트 --}} + {{-- 계약일 --}} + + + {{-- 입금 --}} + {{-- 매니저 --}} + {{-- 지급예정일 --}} + + + {{-- 매니저지급일 --}} + + + {{-- 상태 --}} - - - {{-- Row 2: 지급 정보 --}} - - - {{-- 상태 빈칸 --}} - @empty - diff --git a/resources/views/finance/settlement/partials/commission/partner-commission-table.blade.php b/resources/views/finance/settlement/partials/commission/partner-commission-table.blade.php index 0299dec5..e0818abe 100644 --- a/resources/views/finance/settlement/partials/commission/partner-commission-table.blade.php +++ b/resources/views/finance/settlement/partials/commission/partner-commission-table.blade.php @@ -1,4 +1,4 @@ -{{-- 영업파트너 수당 테이블 (2행 레이아웃) --}} +{{-- 영업파트너 수당 테이블 (1행 레이아웃) --}}
테넌트계약일 입금 매니저지급예정일매니저지급일 상태 액션
+ {{-- 체크박스 --}} + @if (in_array($commission->status, ['pending', 'approved'])) + class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-emerald-500"> @endif
{{ $commission->management?->tenant?->company_name ?? $commission->management?->tenantProspect?->company_name ?? '-' }} @@ -81,6 +85,12 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
+ {{ $mgmt?->contracted_at?->format('Y-m-d') ?? '-' }} + @if ($displayPayment > 0)
{{ number_format($displayPayment) }}
@@ -90,6 +100,7 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
{{ $commission->payment_date->format('Y-m-d') }}
{{ $commission->manager?->name ?? $commission->management?->manager?->name ?? '-' }} (구독1월)
@@ -101,13 +112,32 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
+ {{ $commission->scheduled_payment_date->format('Y-m-d') }} + + @if($isGroup) + - + @else + + @endif + {{ $commission->status_label }} + {{-- 액션 --}} +
-
-
- 지급예정일: - {{ $commission->scheduled_payment_date->format('Y-m-d') }} -
-
- 매니저지급일: - @if($isGroup) - - - @else - - @endif -
-
-
+ 등록된 정산 내역이 없습니다.
@@ -8,9 +8,13 @@ + + + + @@ -84,17 +88,18 @@ ]; @endphp - {{-- Row 1: 메인 정보 --}} - + {{-- 테넌트 --}} + {{-- 계약일 --}} + + + {{-- 입금 --}} + {{-- 영업파트너 --}} + {{-- 유치파트너 --}} + {{-- 지급예정일 --}} + + + {{-- 수당지급일 --}} + + + {{-- 협업지원금 --}} + + + {{-- 상태 --}} - - - {{-- Row 2: 지급 정보 --}} - - - {{-- 상태 빈칸 --}} - @empty -
테넌트계약일 입금 영업파트너 유치파트너지급예정일수당지급일협업지원금 상태 액션
+ {{-- 체크박스 --}} + @if (in_array($commission->status, ['pending', 'approved'])) + class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-emerald-500"> @endif
{{ $commission->management?->tenant?->company_name ?? $commission->management?->tenantProspect?->company_name ?? '-' }} @@ -108,6 +113,12 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
+ {{ $mgmt?->contracted_at?->format('Y-m-d') ?? '-' }} + @if ($displayPayment > 0)
{{ number_format($displayPayment) }}
@@ -117,6 +128,7 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
{{ $commission->payment_date->format('Y-m-d') }}
{{ $partnerName }} ({{ $pRate }}%)
@@ -128,6 +140,7 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
@if ($referrerName)
{{ $referrerName }} ({{ $rRate }}%)
@@ -143,13 +156,42 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e @endif
+ {{ $commission->scheduled_payment_date->format('Y-m-d') }} + + + + @if(!$isGroup) + + @else + - + @endif + {{ $commission->status_label }} + {{-- 액션 --}} +
-
-
- 지급예정일: - {{ $commission->scheduled_payment_date->format('Y-m-d') }} -
-
- 수당지급일: - -
-
- 협업지원금: - @if(!$isGroup) - - @else - - - @endif -
-
-
+ 등록된 정산 내역이 없습니다.