diff --git a/app/Http/Controllers/Api/Admin/HR/PayrollController.php b/app/Http/Controllers/Api/Admin/HR/PayrollController.php index d75c95da..c4aad48b 100644 --- a/app/Http/Controllers/Api/Admin/HR/PayrollController.php +++ b/app/Http/Controllers/Api/Admin/HR/PayrollController.php @@ -291,7 +291,7 @@ public function export(Request $request): StreamedResponse $file = fopen('php://output', 'w'); fwrite($file, "\xEF\xBB\xBF"); // UTF-8 BOM - fputcsv($file, ['사원명', '부서', '기본급', '초과근무수당', '상여금', '총지급액', '소득세', '주민세', '건강보험', '국민연금', '고용보험', '총공제액', '실수령액', '상태']); + fputcsv($file, ['사원명', '부서', '기본급', '고정연장근로수당', '상여금', '총지급액', '국민연금', '건강보험', '고용보험', '근로소득세', '지방소득세', '총공제액', '실수령액', '상태']); foreach ($payrolls as $payroll) { $profile = $payroll->user?->tenantProfiles?->first(); @@ -306,11 +306,11 @@ public function export(Request $request): StreamedResponse $payroll->overtime_pay, $payroll->bonus, $payroll->gross_salary, + $payroll->pension, + $payroll->health_insurance, + $payroll->employment_insurance, $payroll->income_tax, $payroll->resident_tax, - $payroll->health_insurance, - $payroll->pension, - $payroll->employment_insurance, $payroll->total_deductions, $payroll->net_salary, $statusLabel, diff --git a/app/Services/HR/PayrollService.php b/app/Services/HR/PayrollService.php index e8f3ab06..a6be8a8c 100644 --- a/app/Services/HR/PayrollService.php +++ b/app/Services/HR/PayrollService.php @@ -377,9 +377,9 @@ public function calculateAmounts(array $data, ?PayrollSetting $settings = null): $pension = $this->calculatePension($grossSalary, $settings); $employmentInsurance = $this->calculateEmploymentInsurance($grossSalary, $settings); - // 소득세 (간이세액표) + // 근로소득세 (간이세액표) $incomeTax = $this->calculateIncomeTax($grossSalary); - // 주민세 (소득세의 10%) + // 지방소득세 (근로소득세의 10%) $residentTax = (int) floor($incomeTax * ($settings->resident_tax_rate / 100)); // 추가 공제 합계 @@ -410,7 +410,7 @@ public function calculateAmounts(array $data, ?PayrollSetting $settings = null): } /** - * 소득세 계산 (간이세액표 기준, 부양가족 1인) + * 근로소득세 계산 (간이세액표 기준, 부양가족 1인) */ public function calculateIncomeTax(float $grossSalary, int $dependents = 1): int { diff --git a/resources/views/hr/payrolls/index.blade.php b/resources/views/hr/payrolls/index.blade.php index 03ccb898..6b39d5ea 100644 --- a/resources/views/hr/payrolls/index.blade.php +++ b/resources/views/hr/payrolls/index.blade.php @@ -185,7 +185,7 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:ring-2 f class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
- + @@ -212,11 +212,11 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:ring-2 f

공제 항목 (자동 계산)

-
소득세0
-
주민세0
-
건강보험0
국민연금0
+
건강보험0
고용보험0
+
근로소득세0
+
지방소득세0
@@ -701,7 +701,7 @@ function openPayrollDetail(id, data) { html += '
'; html += ''; html += ``; - html += ``; + html += ``; html += ``; if (data.allowances && data.allowances.length > 0) { @@ -713,11 +713,11 @@ function openPayrollDetail(id, data) { html += ``; html += ''; - html += ``; - html += ``; - html += ``; html += ``; + html += ``; html += ``; + html += ``; + html += ``; if (data.deductions && data.deductions.length > 0) { data.deductions.forEach(d => { diff --git a/resources/views/hr/payrolls/partials/table.blade.php b/resources/views/hr/payrolls/partials/table.blade.php index dde8edc1..070ab69f 100644 --- a/resources/views/hr/payrolls/partials/table.blade.php +++ b/resources/views/hr/payrolls/partials/table.blade.php @@ -53,7 +53,7 @@ {{ number_format($payroll->base_salary) }} - {{-- 수당 (초과근무+상여+기타) --}} + {{-- 수당 (고정연장근로+상여+기타) --}}
지급 항목
기본급${numberFormat(data.base_salary)}
초과근무수당${numberFormat(data.overtime_pay)}
고정연장근로수당${numberFormat(data.overtime_pay)}
상여금${numberFormat(data.bonus)}
총 지급액${numberFormat(data.gross_salary)}
공제 항목
소득세${numberFormat(data.income_tax)}
주민세${numberFormat(data.resident_tax)}
건강보험${numberFormat(data.health_insurance)}
국민연금${numberFormat(data.pension)}
건강보험${numberFormat(data.health_insurance)}
고용보험${numberFormat(data.employment_insurance)}
근로소득세${numberFormat(data.income_tax)}
지방소득세${numberFormat(data.resident_tax)}
{{ $overtimeBonus > 0 ? number_format($overtimeBonus) : '-' }}