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 28d41f2bb8
commit 0629fb501e
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());
@@ -435,7 +435,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'));
@@ -802,7 +802,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());
@@ -825,7 +825,6 @@ class AttendanceRecordController extends Controller
'Employee',
'Date',
'Shift',
'Attedance Policy',
'Clock In',
'Clock Out',
'Break Hours',
@@ -842,7 +841,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 ?? '',