fix: remove location_exempt from validation and prevent form reset on error
This commit is contained in:
@@ -236,7 +236,6 @@ class EmployeeController extends Controller
|
||||
'rest_days' => 'nullable|array',
|
||||
'rest_days.*' => 'string|in:monday,tuesday,wednesday,thursday,friday,saturday,sunday',
|
||||
'attendance_policy_id' => 'nullable|exists:attendance_policies,id',
|
||||
'is_location_exempt' => 'nullable|boolean',
|
||||
'salary' => 'required|numeric|min:0',
|
||||
|
||||
// Employment details
|
||||
@@ -318,7 +317,7 @@ class EmployeeController extends Controller
|
||||
$user->password = Hash::make($request->password);
|
||||
$user->type = 'employee';
|
||||
$user->lang = 'en';
|
||||
$user->is_location_exempt = $request->has('is_location_exempt') ? filter_var($request->is_location_exempt, FILTER_VALIDATE_BOOLEAN) : false;
|
||||
|
||||
$user->created_by = creatorId();
|
||||
|
||||
// Handle profile image upload for user
|
||||
@@ -568,7 +567,6 @@ class EmployeeController extends Controller
|
||||
'rest_days' => 'nullable|array',
|
||||
'rest_days.*' => 'string|in:monday,tuesday,wednesday,thursday,friday,saturday,sunday',
|
||||
'attendance_policy_id' => 'nullable|exists:attendance_policies,id',
|
||||
'is_location_exempt' => 'nullable|boolean',
|
||||
'salary' => 'required|numeric|min:0',
|
||||
|
||||
// Employment details
|
||||
@@ -616,9 +614,7 @@ class EmployeeController extends Controller
|
||||
// Update User model object
|
||||
$user->name = $request->name;
|
||||
$user->email = $request->email;
|
||||
if ($request->has('is_location_exempt')) {
|
||||
$user->is_location_exempt = filter_var($request->is_location_exempt, FILTER_VALIDATE_BOOLEAN);
|
||||
}
|
||||
|
||||
|
||||
// Hash password if provided
|
||||
if ($request->has('password') && !empty($request->password)) {
|
||||
|
||||
Reference in New Issue
Block a user