remove avatar from user management
This commit is contained in:
@@ -23,10 +23,8 @@ class UserManagementController extends Controller
|
|||||||
|
|
||||||
public function index(Request $request): JsonResponse
|
public function index(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
$query = User::query()->where('username', "<>", "witel");
|
|
||||||
|
|
||||||
$data = DataTableFacade::run(
|
$data = DataTableFacade::run(
|
||||||
$query,
|
User::query()->where('username', "<>", "witel"),
|
||||||
$request,
|
$request,
|
||||||
allowedFilters: array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id'),
|
allowedFilters: array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id'),
|
||||||
allowedSortings: array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id'),
|
allowedSortings: array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id'),
|
||||||
@@ -41,10 +39,6 @@ class UserManagementController extends Controller
|
|||||||
DB::transaction(function () use ($request) {
|
DB::transaction(function () use ($request) {
|
||||||
$province = Province::query()->find($request->province_id);
|
$province = Province::query()->find($request->province_id);
|
||||||
|
|
||||||
$avatar = $request->avatar
|
|
||||||
? FileFacade::save($request->file('avatar'), 'users/avatars/' . $request->username)
|
|
||||||
: null;
|
|
||||||
|
|
||||||
$user = User::query()->create([
|
$user = User::query()->create([
|
||||||
'full_name' => $request->full_name,
|
'full_name' => $request->full_name,
|
||||||
'username' => $request->username,
|
'username' => $request->username,
|
||||||
@@ -55,7 +49,6 @@ class UserManagementController extends Controller
|
|||||||
'province_id' => $province->id,
|
'province_id' => $province->id,
|
||||||
'province_fa' => $province->name,
|
'province_fa' => $province->name,
|
||||||
'password' => Hash::make($request->password),
|
'password' => Hash::make($request->password),
|
||||||
'avatar' => $avatar,
|
|
||||||
'email' => $request->email,
|
'email' => $request->email,
|
||||||
'telephone_id' => $request->telephone_id,
|
'telephone_id' => $request->telephone_id,
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ class CallController extends Controller
|
|||||||
|
|
||||||
$event_name = Event::query()->find($event_id)->first()->name;
|
$event_name = Event::query()->find($event_id)->first()->name;
|
||||||
|
|
||||||
CallHistory::create([
|
CallHistory::query()->create([
|
||||||
'call_id' => $call->id,
|
'call_id' => $call->id,
|
||||||
'telephone_id' => $call->telephone_id,
|
'telephone_id' => $call->telephone_id,
|
||||||
'caller_phone_number' => $call->caller_phone_number,
|
'caller_phone_number' => $call->caller_phone_number,
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ class ProfileController extends Controller
|
|||||||
{
|
{
|
||||||
return $this->successResponse(new UserResource(auth()->user()));
|
return $this->successResponse(new UserResource(auth()->user()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function changePassword(ChangePasswordRequest $request): JsonResponse
|
public function changePassword(ChangePasswordRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
$user = auth()->user();
|
$user = auth()->user();
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ class StoreRequest extends FormRequest
|
|||||||
'full_name' => 'required|max:255|string',
|
'full_name' => 'required|max:255|string',
|
||||||
'username' => 'required|unique:users,username|string',
|
'username' => 'required|unique:users,username|string',
|
||||||
'position' => 'required',
|
'position' => 'required',
|
||||||
'gender' => 'required|in:male,female',
|
'gender' => 'required|in:1,2',
|
||||||
'national_id' => 'required|digits:10|unique:users,national_id',
|
'national_id' => 'required|digits:10|unique:users,national_id',
|
||||||
'phone_number' => 'required|numeric|digits:11|unique:users,phone_number|regex:/^09\d{9}$/',
|
'phone_number' => 'required|numeric|digits:11|unique:users,phone_number|regex:/^09\d{9}$/',
|
||||||
'province_id' => 'required|exists:provinces,id',
|
'province_id' => 'required|exists:provinces,id',
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ class UserResource extends JsonResource
|
|||||||
'province_id' => $this->province_id,
|
'province_id' => $this->province_id,
|
||||||
'province_name' => $this->province_name,
|
'province_name' => $this->province_name,
|
||||||
'role' => $this->roles->pluck('id', 'name_fa'),
|
'role' => $this->roles->pluck('id', 'name_fa'),
|
||||||
|
'permissions' => $this->getPermissionNames(),
|
||||||
'telephone_id' => $this->telephone_id
|
'telephone_id' => $this->telephone_id
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ return new class extends Migration
|
|||||||
$table->string('name');
|
$table->string('name');
|
||||||
$table->double('lat');
|
$table->double('lat');
|
||||||
$table->double('lon');
|
$table->double('lon');
|
||||||
|
$table->string('ip');
|
||||||
|
$table->string('camera_ip');
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user