user roles, bug fixes
This commit is contained in:
@@ -45,11 +45,16 @@ class StaffMembersController extends Controller
|
||||
|
||||
// dd($staffMembers);
|
||||
// dd(\Auth::user()->designation);
|
||||
|
||||
$systemRoles = \App\Models\ErpSystemRole::orderBy('name')->get();
|
||||
|
||||
|
||||
$data = [
|
||||
'staffMembers' => $staffMembers,
|
||||
'departments' => $departments,
|
||||
'allstaffMembers' => $allstaffMembers,
|
||||
'countries' => $countries,
|
||||
'systemRoles' => $systemRoles
|
||||
];
|
||||
|
||||
|
||||
@@ -73,12 +78,17 @@ class StaffMembersController extends Controller
|
||||
$validated['profile_pic'] = $request->file('photo')->store('staff_profiles', 'public');
|
||||
}
|
||||
|
||||
// $user->roles()->syncWithoutDetaching([$roleId]); // Add without removing existing roles
|
||||
// $user->roles()->sync($roleIds); // Replace the user's role set
|
||||
|
||||
$validated['created_by'] = auth()->id() ?? 1;
|
||||
$validated['password'] = Hash::make('default_password');
|
||||
$validated['hire_date'] = now();
|
||||
|
||||
StaffMember::create($validated);
|
||||
|
||||
if ($request->has('roles')) {
|
||||
$staff->roles()->sync($request->roles);
|
||||
}
|
||||
return response()->json(['success' => true, 'message' => 'Staff member added successfully!']);
|
||||
}
|
||||
|
||||
@@ -107,6 +117,8 @@ class StaffMembersController extends Controller
|
||||
$validated['modified_by'] = auth()->id() ?? 1;
|
||||
|
||||
$staff->update($validated);
|
||||
$staff->roles()->sync($request->roles ?? []);
|
||||
|
||||
|
||||
return response()->json(['success' => true, 'message' => 'Staff member updated successfully!']);
|
||||
}
|
||||
@@ -152,7 +164,7 @@ class StaffMembersController extends Controller
|
||||
}
|
||||
public function showDetails($id)
|
||||
{
|
||||
$staff = StaffMember::with('dependents')->findOrFail($id);
|
||||
$staff = StaffMember::with(['dependents', 'roles'])->findOrFail($id);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
|
||||
Reference in New Issue
Block a user