admin/HRM-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove obsolete attendancePolicy relationship calls and update 13th month calculation rules

Browse Source
This commit is contained in:
admin
2026-08-11 09:13:42 +08:00
parent a77fd9a575
commit ec3c00ffff
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/AttendanceRecordController.php
View File

@@ -41,7 +41,7 @@ class AttendanceRecordController extends Controller
}
if (Auth::user()->can('manage-attendance-records')) {
$query = AttendanceRecord::with(['employee.employee.branch', 'shift', 'attendancePolicy', 'creator'])
$query = AttendanceRecord::with(['employee.employee.branch', 'shift', 'creator'])
->where(function ($q) {
if (Auth::user()->can('manage-any-attendance-records')) {
$q->whereIn('created_by', getCompanyAndUsersId());
@@ -442,7 +442,7 @@ class AttendanceRecordController extends Controller
$attendanceRecord->update($validated);
// Reload necessary relationships if not already fresh
$attendanceRecord->loadMissing(['shift', 'attendancePolicy']);
$attendanceRecord->loadMissing(['shift']);
$attendanceRecord->processAttendance(false);
return redirect()->back()->with('success', __('Attendance record updated successfully'));
@@ -735,7 +735,7 @@ class AttendanceRecordController extends Controller
{
if (Auth::user()->can('export-attendance-record')) {
try {
$attendanceRecords = AttendanceRecord::with(['employee', 'shift', 'attendancePolicy'])
$attendanceRecords = AttendanceRecord::with(['employee', 'shift'])
->where(function ($q) {
if (Auth::user()->can('manage-any-attendance-records')) {
$q->whereIn('created_by', getCompanyAndUsersId());
@@ -758,7 +758,6 @@ class AttendanceRecordController extends Controller
'Employee',
'Date',
'Shift',
'Attedance Policy',
'Clock In',
'Clock Out',
'Break Hours',
@@ -775,7 +774,6 @@ class AttendanceRecordController extends Controller
$record->employee->name ?? '',
$record->date ? date('Y-m-d', strtotime($record->date)) : '',
$record->shift->name ?? '',
$record->attendancePolicy->name ?? '',
$record->clock_in ?? '',
$record->clock_out ?? '',
$record->break_hours ?? '',

6
app/Http/Controllers/EmployeeController.php
View File

@@ -462,7 +462,7 @@ class EmployeeController extends Controller
}
// Load user with employee relationships
$user = User::with(['employee.branch', 'employee.department', 'employee.designation', 'employee.shift', 'employee.attendancePolicy', 'employee.documents.documentType'])
$user = User::with(['employee.branch', 'employee.department', 'employee.designation', 'employee.shift', 'employee.documents.documentType'])
->where('id', $employee->user_id)
->first();
@@ -1149,7 +1149,7 @@ class EmployeeController extends Controller
{
if (Auth::user()->can('export-employee')) {
try {
$employees = User::with(['employee.branch', 'employee.department', 'employee.designation', 'employee.shift', 'employee.attendancePolicy'])
$employees = User::with(['employee.branch', 'employee.department', 'employee.designation', 'employee.shift'])
->where('type', 'employee')
->where(function ($q) {
if (Auth::user()->can('manage-any-employees')) {
@@ -1182,7 +1182,6 @@ class EmployeeController extends Controller
'Gender',
'Shift',
'Basic Salary',
'Attedance Policy',
'Employement Type',
'Employement Status',
'City',
@@ -1212,7 +1211,6 @@ class EmployeeController extends Controller
$employee->gender ?? '',
$employee->shift->name ?? '',
$employee->base_salary ?? '',
$employee->attendancePolicy->name ?? '',
$employee->employment_type ?? '',
$employee->employee_status ?? 'active',
$employee->city ?? '',