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

fix(mobile): resolve user avatars, chat alignment, timestamp formatting, and payslips API

Browse Source
This commit is contained in:
Ajjj
2026-08-10 17:55:14 +08:00
parent 6fe1fe125e
commit 9597cbf99a
1468 changed files with 172818 additions and 65664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/Http/Controllers/Api/AuthController.php
View File

@@ -42,10 +42,15 @@ class AuthController extends Controller
$deviceName = $request->device_name ?? 'mobile_app';
$token = $user->createToken($deviceName)->plainTextToken;
$user->load('employee');
if (!empty($user->avatar)) {
$user->avatar = get_file($user->avatar);
}
return response()->json([
'success' => true,
'token' => $token,
'user' => $user->load('employee'),
'user' => $user,
'data' => [
'token' => $token,
'user' => $user,
@@ -73,6 +78,13 @@ class AuthController extends Controller
{
$user = $request->user()->load('employee');
if (!empty($user->avatar)) {
$user->avatar = get_file($user->avatar);
}
if ($user->employee && !empty($user->employee->avatar)) {
$user->employee->avatar = get_file($user->employee->avatar);
}
return response()->json([
'success' => true,
'user' => $user,
@@ -80,6 +92,7 @@ class AuthController extends Controller
'id' => $user->id,
'name' => $user->name,
'email' => $user->email,
'avatar' => $user->avatar,
'user' => $user,
'employee' => $user->employee,
],
@@ -107,17 +120,55 @@ class AuthController extends Controller
}
if ($request->hasFile('avatar')) {
$avatarPath = $request->file('avatar')->store('avatars', 'public');
$user->avatar = asset('storage/' . $avatarPath);
$file = $request->file('avatar');
$filename = time() . '_' . uniqid() . '.' . $file->getClientOriginalExtension();
$file->storeAs('avatars', $filename, 'public');
$user->avatar = 'avatars/' . $filename;
if ($user->employee && \Schema::hasColumn('employees', 'avatar')) {
try {
$user->employee->avatar = 'avatars/' . $filename;
$user->employee->save();
} catch (\Exception $e) {}
}
}
$user->save();
if ($user->employee) {
try {
$emp = $user->employee;
$empFields = [
'phone', 'date_of_birth', 'gender', 'address_line_1', 'address_line_2',
'city', 'state', 'country', 'postal_code', 'emergency_contact_name',
'emergency_contact_relationship', 'emergency_contact_number',
'bank_name', 'account_holder_name', 'account_number'
];
foreach ($empFields as $field) {
if ($request->has($field)) {
$emp->{$field} = $request->input($field);
}
}
$emp->save();
} catch (\Exception $e) {}
}
$freshUser = $user->fresh('employee');
if (!empty($freshUser->avatar)) {
$freshUser->avatar = get_file($freshUser->avatar);
}
if ($freshUser->employee && !empty($freshUser->employee->avatar)) {
$freshUser->employee->avatar = get_file($freshUser->employee->avatar);
}
return response()->json([
'success' => true,
'message' => 'Profile updated successfully',
'user' => $user->fresh('employee'),
'data' => $user->fresh('employee'),
'user' => $freshUser,
'data' => [
'user' => $freshUser,
'employee' => $freshUser->employee,
'avatar' => $freshUser->avatar,
],
'errors' => null,
]);
}