Compare commits
6 Commits
feature/Cr
...
feature/Ed
| Author | SHA1 | Date | |
|---|---|---|---|
| d04637b1ef | |||
| 3c61e279ec | |||
| e9f6ee71fa | |||
| 60129f5abb | |||
| 2d8f2dbcc5 | |||
| 86e353749a |
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Admin\Controllers;
|
namespace App\Admin\Controllers;
|
||||||
|
|
||||||
use App\Admin\Requests\Profile\ChangePasswordRequest;
|
use App\Admin\Requests\Profile\ChangePasswordRequest;
|
||||||
|
use App\Admin\Requests\Profile\EditRequest;
|
||||||
use App\Admin\Resources\ExpertResource;
|
use App\Admin\Resources\ExpertResource;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Traits\ApiResponse;
|
use App\Traits\ApiResponse;
|
||||||
@@ -19,6 +20,24 @@ class ProfileController extends Controller
|
|||||||
return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
|
return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function edit(EditRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$expert = $request->user('expert');
|
||||||
|
|
||||||
|
$expert->update([
|
||||||
|
'username' => $request->username,
|
||||||
|
'first_name' => $request->first_name,
|
||||||
|
'last_name' => $request->last_name,
|
||||||
|
'email' => $expert->email,
|
||||||
|
'national_id' => $request->national_id,
|
||||||
|
'phone_number' => $request->phone_number,
|
||||||
|
'province_id' => $request->province_id,
|
||||||
|
'city_id' => $request->city_id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return $this->successResponse();
|
||||||
|
}
|
||||||
|
|
||||||
public function changePassword(ChangePasswordRequest $request): JsonResponse
|
public function changePassword(ChangePasswordRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
$expert = Auth::guard('expert')->user();
|
$expert = Auth::guard('expert')->user();
|
||||||
|
|||||||
39
backend/app/Admin/Requests/Profile/EditRequest.php
Executable file
39
backend/app/Admin/Requests/Profile/EditRequest.php
Executable file
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Admin\Requests\Profile;
|
||||||
|
|
||||||
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
use Illuminate\Validation\Validator;
|
||||||
|
|
||||||
|
class EditRequest extends FormRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determine if the user is authorized to make this request.
|
||||||
|
*/
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the validation rules that apply to the request.
|
||||||
|
*
|
||||||
|
* @return array<string, ValidationRule|array|string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$user = $this->user();
|
||||||
|
return [
|
||||||
|
'username' => 'string|max:255',
|
||||||
|
'first_name' => 'required|string',
|
||||||
|
'last_name' => 'required|string',
|
||||||
|
'national_id' => 'required',
|
||||||
|
'email' => 'string|email|max:255',
|
||||||
|
'phone_number' => 'string',
|
||||||
|
'province_id' => 'string',
|
||||||
|
'city_id' => 'string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,17 +24,7 @@ class ProfileController extends Controller
|
|||||||
{
|
{
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
$user->update([
|
$user->update($request->validated());
|
||||||
'first_name' => $request->first_name,
|
|
||||||
'last_name' => $request->last_name,
|
|
||||||
'national_id' => $request->national_id,
|
|
||||||
'address' => $request->address,
|
|
||||||
'postal_code' => $request->postal_code,
|
|
||||||
'phone_number' => $request->phone_number,
|
|
||||||
'province_id' => $request->province_id,
|
|
||||||
'city_id' => $request->city_id,
|
|
||||||
'status' => 1
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $this->successResponse();
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ namespace App\User\Requests\Profile;
|
|||||||
|
|
||||||
use Illuminate\Contracts\Validation\ValidationRule;
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
use Illuminate\Validation\Validator;
|
||||||
|
|
||||||
class EditRequest extends FormRequest
|
class EditRequest extends FormRequest
|
||||||
{
|
{
|
||||||
@@ -22,10 +24,18 @@ class EditRequest extends FormRequest
|
|||||||
*/
|
*/
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
|
$user = $this->user();
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'first_name' => 'required|string',
|
'first_name' => [
|
||||||
'last_name' => 'required|string',
|
Rule::prohibitedIf($user->kyc_status == 1), 'string',
|
||||||
'national_id' => 'required',
|
],
|
||||||
|
'last_name' => [
|
||||||
|
Rule::prohibitedIf($user->kyc_status == 1), 'string',
|
||||||
|
],
|
||||||
|
'national_id' => [
|
||||||
|
Rule::prohibitedIf($user->kyc_status == 1), 'string',
|
||||||
|
],
|
||||||
'address' => 'required',
|
'address' => 'required',
|
||||||
'postal_code' => 'required',
|
'postal_code' => 'required',
|
||||||
'phone_number' => 'required',
|
'phone_number' => 'required',
|
||||||
@@ -33,4 +43,28 @@ class EditRequest extends FormRequest
|
|||||||
'city_id' => 'required',
|
'city_id' => 'required',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
public function after(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
function (Validator $validator) {
|
||||||
|
$user = $this->user();
|
||||||
|
if ($user->kyc_status == 1) {
|
||||||
|
$lockedFields = [
|
||||||
|
'first_name',
|
||||||
|
'last_name',
|
||||||
|
'national_id',
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($lockedFields as $field) {
|
||||||
|
if ($this->filled($field)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
$field,
|
||||||
|
'you cannot change this field.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ use App\Admin\Controllers\AuthController;
|
|||||||
use App\Admin\Controllers\DocumentationController;
|
use App\Admin\Controllers\DocumentationController;
|
||||||
use App\Admin\Controllers\ExpertManagementController;
|
use App\Admin\Controllers\ExpertManagementController;
|
||||||
use App\Admin\Controllers\PermissionManagementController;
|
use App\Admin\Controllers\PermissionManagementController;
|
||||||
|
use App\Admin\Controllers\ProfileController;
|
||||||
use App\Admin\Controllers\RoleManagementController;
|
use App\Admin\Controllers\RoleManagementController;
|
||||||
use App\Admin\Controllers\UserManagementController;
|
use App\Admin\Controllers\UserManagementController;
|
||||||
|
|
||||||
@@ -71,3 +72,13 @@ Route::prefix('expert')
|
|||||||
Route::post('/{expert}', 'update')->name('update');
|
Route::post('/{expert}', 'update')->name('update');
|
||||||
Route::delete('/{expert}', 'destroy')->name('destroy');
|
Route::delete('/{expert}', 'destroy')->name('destroy');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Route::prefix('profile')
|
||||||
|
->name('profile.')
|
||||||
|
->middleware('auth')
|
||||||
|
->controller(ProfileController::class)
|
||||||
|
->group(function () {
|
||||||
|
Route::get('info', 'info')->name('info');
|
||||||
|
Route::post('edit', 'edit')->name('edit');
|
||||||
|
Route::post('change_password', 'changePassword')->name('changePassword');
|
||||||
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user