diff --git a/backend/app/Admin/Controllers/UserManagementController.php b/backend/app/Admin/Controllers/UserManagementController.php index 94adf110..81ad99ad 100644 --- a/backend/app/Admin/Controllers/UserManagementController.php +++ b/backend/app/Admin/Controllers/UserManagementController.php @@ -27,7 +27,9 @@ class UserManagementController extends Controller $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id', 'username', 'province_id', 'city_id', 'first_name', 'last_name', 'mobile',], + allowedSelects: ['id', 'username','first_name', 'last_name','kyc_status','national_id', + 'phone_number','postal_code','province_id','province_name', 'city_id', 'city_name', + 'birth_date','tax_id', 'password', 'email', 'level', 'key_status'], ); return response()->json($data); @@ -38,6 +40,9 @@ class UserManagementController extends Controller */ public function store(StoreRequest $request): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + User::query()->create([ 'username' => $request->username, 'first_name' => $request->first_name, @@ -45,14 +50,14 @@ class UserManagementController extends Controller 'national_id' => $request->national_id, 'password' => Hash::make($request->password), 'email' => $request->email, - 'birthday' => $request->birthday, + 'birth_date' => $request->birth_date, 'phone_number' => $request->phone_number, 'postal_code' => $request->postal_code, 'address' => $request->address, 'province_id' => $request->province_id, - 'province_name' => Province::query()->find($request->province_id)->name, + 'province_name' => $province->name, 'city_id' => $request->city_id, - 'city_name' => City::query()->find($request->city_id)->name, + 'city_name' => $city->name, 'key_status' => $request->key_status, 'level' => $request->level, 'tax_id' => $request->tax_id, @@ -77,6 +82,9 @@ class UserManagementController extends Controller */ public function update(UpdateRequest $request, User $user): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + $user->update([ 'first_name' => $request->first_name, 'username' => $request->username, @@ -84,14 +92,14 @@ class UserManagementController extends Controller 'national_id' => $request->national_id, 'password' => Hash::make($request->password), 'email' => $request->email, - 'birthday' => $request->birthday, + 'birth_date' => $request->birth_date, 'phone_number' => $request->phone_number, 'postal_code' => $request->postal_code, 'address' => $request->address, 'province_id' => $request->province_id, - 'province_name' => Province::query()->find($request->province_id)->name, + 'province_name' => $province->name, 'city_id' => $request->city_id, - 'city_name' => City::query()->find($request->city_id)->name, + 'city_name' => $city->name, 'key_status' => $request->key_status, 'level' => $request->level, 'tax_id' => $request->tax_id, diff --git a/backend/app/Admin/Requests/UserManagement/StoreRequest.php b/backend/app/Admin/Requests/UserManagement/StoreRequest.php index d0e2a741..a3c9cf92 100644 --- a/backend/app/Admin/Requests/UserManagement/StoreRequest.php +++ b/backend/app/Admin/Requests/UserManagement/StoreRequest.php @@ -29,7 +29,7 @@ class StoreRequest extends FormRequest 'national_id' => 'required|string|max:20|unique:users,national_id', 'password' => 'required|string|min:6|confirmed', 'email' => 'required|email|max:255|unique:users,email', - 'birthday' => 'nullable|date', + 'birth_date' => 'nullable|date', 'phone_number' => 'required|string|max:20|unique:users,phone_number', 'postal_code' => 'nullable|string|max:20', 'address' => 'nullable|string|max:1000', diff --git a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php index 2f4774cd..4d8c56b4 100644 --- a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php @@ -37,7 +37,7 @@ class UpdateRequest extends FormRequest 'password' => 'nullable|string|min:8|confirmed', 'email' => ['email', 'max:255', Rule::unique('users', 'email')->ignore($this->user->id),], - 'birthday' => 'nullable|date', + 'birth_date' => 'nullable|date', 'phone_number' => ['string', 'max:20', Rule::unique('users', 'phone_number')->ignore($this->user->id),], 'postal_code' => 'nullable|string|max:20', diff --git a/backend/routes/web.php b/backend/routes/web.php index fc6836d2..439b076a 100755 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -1,5 +1,9 @@ name('edit'); Route::post('change_password', 'changePassword')->name('changePassword'); }); + +Route::prefix('admin') + ->name('Admin.') + ->group(function () { + Route::prefix('user_management') + ->name('user_management.') + ->controller(UserManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('roles') + ->name('roles.') + ->controller(RoleManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('permissions') + ->name('permissions.') + ->controller(PermissionManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('expert') + ->name('expert.') + ->controller(ExpertManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + }); +