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

fix:정산관리 필터를 기간 범위 고정 방식으로 변경 (체크박스 제거, 컴팩트 1줄 레이아웃)

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
김보곤
2026-02-20 14:04:21 +09:00
parent 11c685bda7
commit 4d6081beb6
2 changed files with 65 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/Http/Controllers/Finance/SettlementController.php
View File

@@ -32,41 +32,30 @@ public function index(Request $request): View|Response
$initialTab = $request->input('tab', 'commission');
// 수당 정산 탭 데이터 (기본 탭이므로 즉시 로드)
$year = $request->input('year', now()->year);
$month = $request->input('month', now()->month);
$dateRange = $request->boolean('date_range');
// 수당 정산 탭 데이터 (기간 범위 방식)
$year = (int) $request->input('start_year', now()->year);
$month = (int) $request->input('start_month', now()->month);
$endYear = (int) $request->input('end_year', $year);
$endMonth = (int) $request->input('end_month', $month);
$filters = [
'scheduled_start_year' => $year,
'scheduled_start_month' => $month,
'scheduled_end_year' => $endYear,
'scheduled_end_month' => $endMonth,
'start_year' => $year,
'start_month' => $month,
'end_year' => $endYear,
'end_month' => $endMonth,
'status' => $request->input('status'),
'payment_type' => $request->input('payment_type'),
'partner_id' => $request->input('partner_id'),
'commission_type' => $request->input('commission_type'),
'search' => $request->input('search'),
'date_range' => $dateRange,
];
if ($dateRange) {
$filters['scheduled_start_year'] = (int) $request->input('start_year', $year);
$filters['scheduled_start_month'] = (int) $request->input('start_month', $month);
$filters['scheduled_end_year'] = (int) $request->input('end_year', $year);
$filters['scheduled_end_month'] = (int) $request->input('end_month', $month);
$filters['start_year'] = $filters['scheduled_start_year'];
$filters['start_month'] = $filters['scheduled_start_month'];
$filters['end_year'] = $filters['scheduled_end_year'];
$filters['end_month'] = $filters['scheduled_end_month'];
} else {
$filters['scheduled_year'] = $year;
$filters['scheduled_month'] = $month;
}
$commissions = $this->service->getCommissions($filters);
$stats = $dateRange
? $this->service->getSettlementStatsForRange(
$filters['scheduled_start_year'], $filters['scheduled_start_month'],
$filters['scheduled_end_year'], $filters['scheduled_end_month']
)
: $this->service->getSettlementStats($year, $month);
$stats = $this->service->getSettlementStatsForRange($year, $month, $endYear, $endMonth);
$partners = SalesPartner::with('user')
->active()
@@ -96,9 +85,11 @@ public function index(Request $request): View|Response
*/
public function commissionStats(Request $request): View
{
$year = $request->input('year', now()->year);
$month = $request->input('month', now()->month);
$stats = $this->service->getSettlementStats($year, $month);
$year = (int) $request->input('start_year', now()->year);
$month = (int) $request->input('start_month', now()->month);
$endYear = (int) $request->input('end_year', $year);
$endMonth = (int) $request->input('end_month', $month);
$stats = $this->service->getSettlementStatsForRange($year, $month, $endYear, $endMonth);
return view('finance.settlement.partials.commission.stats-cards', compact('stats', 'year', 'month'));
}
@@ -108,29 +99,23 @@ public function commissionStats(Request $request): View
*/
public function commissionTable(Request $request): View
{
$year = $request->input('year', now()->year);
$month = $request->input('month', now()->month);
$dateRange = $request->boolean('date_range');
$year = (int) $request->input('start_year', now()->year);
$month = (int) $request->input('start_month', now()->month);
$endYear = (int) $request->input('end_year', $year);
$endMonth = (int) $request->input('end_month', $month);
$filters = [
'scheduled_start_year' => $year,
'scheduled_start_month' => $month,
'scheduled_end_year' => $endYear,
'scheduled_end_month' => $endMonth,
'status' => $request->input('status'),
'payment_type' => $request->input('payment_type'),
'partner_id' => $request->input('partner_id'),
'commission_type' => $request->input('commission_type'),
'search' => $request->input('search'),
'date_range' => $dateRange,
];
if ($dateRange) {
$filters['scheduled_start_year'] = (int) $request->input('start_year', $year);
$filters['scheduled_start_month'] = (int) $request->input('start_month', $month);
$filters['scheduled_end_year'] = (int) $request->input('end_year', $year);
$filters['scheduled_end_month'] = (int) $request->input('end_month', $month);
} else {
$filters['scheduled_year'] = $year;
$filters['scheduled_month'] = $month;
}
$commissions = $this->service->getCommissions($filters);
return view('finance.settlement.partials.commission.table', compact('commissions'));