diff --git a/app/Http/Controllers/Admin/UserManagementController.php b/app/Http/Controllers/Admin/UserManagementController.php index dbb0292..1f7f035 100644 --- a/app/Http/Controllers/Admin/UserManagementController.php +++ b/app/Http/Controllers/Admin/UserManagementController.php @@ -23,10 +23,8 @@ class UserManagementController extends Controller public function index(Request $request): JsonResponse { - $query = User::query()->where('username', "<>", "witel"); - $data = DataTableFacade::run( - $query, + User::query()->where('username', "<>", "witel"), $request, 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'), @@ -41,10 +39,6 @@ class UserManagementController extends Controller DB::transaction(function () use ($request) { $province = Province::query()->find($request->province_id); - $avatar = $request->avatar - ? FileFacade::save($request->file('avatar'), 'users/avatars/' . $request->username) - : null; - $user = User::query()->create([ 'full_name' => $request->full_name, 'username' => $request->username, @@ -55,7 +49,6 @@ class UserManagementController extends Controller 'province_id' => $province->id, 'province_fa' => $province->name, 'password' => Hash::make($request->password), - 'avatar' => $avatar, 'email' => $request->email, 'telephone_id' => $request->telephone_id, ]); diff --git a/app/Http/Controllers/CallController.php b/app/Http/Controllers/CallController.php index 14242d7..6cf67ba 100644 --- a/app/Http/Controllers/CallController.php +++ b/app/Http/Controllers/CallController.php @@ -105,7 +105,7 @@ class CallController extends Controller $event_name = Event::query()->find($event_id)->first()->name; - CallHistory::create([ + CallHistory::query()->create([ 'call_id' => $call->id, 'telephone_id' => $call->telephone_id, 'caller_phone_number' => $call->caller_phone_number, diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index becd223..fb6053f 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -21,6 +21,7 @@ class ProfileController extends Controller { return $this->successResponse(new UserResource(auth()->user())); } + public function changePassword(ChangePasswordRequest $request): JsonResponse { $user = auth()->user(); diff --git a/app/Http/Requests/Admin/UserManagement/StoreRequest.php b/app/Http/Requests/Admin/UserManagement/StoreRequest.php index f828f54..a8bd73d 100644 --- a/app/Http/Requests/Admin/UserManagement/StoreRequest.php +++ b/app/Http/Requests/Admin/UserManagement/StoreRequest.php @@ -26,7 +26,7 @@ class StoreRequest extends FormRequest 'full_name' => 'required|max:255|string', 'username' => 'required|unique:users,username|string', 'position' => 'required', - 'gender' => 'required|in:male,female', + 'gender' => 'required|in:1,2', 'national_id' => 'required|digits:10|unique:users,national_id', 'phone_number' => 'required|numeric|digits:11|unique:users,phone_number|regex:/^09\d{9}$/', 'province_id' => 'required|exists:provinces,id', diff --git a/app/Http/Resources/Admin/UserResource.php b/app/Http/Resources/Admin/UserResource.php index 7f81196..a3b05c4 100644 --- a/app/Http/Resources/Admin/UserResource.php +++ b/app/Http/Resources/Admin/UserResource.php @@ -26,6 +26,7 @@ class UserResource extends JsonResource 'province_id' => $this->province_id, 'province_name' => $this->province_name, 'role' => $this->roles->pluck('id', 'name_fa'), + 'permissions' => $this->getPermissionNames(), 'telephone_id' => $this->telephone_id ]; } diff --git a/database/migrations/2025_04_28_101821_create_provinces_table.php b/database/migrations/2025_04_28_101821_create_provinces_table.php index 1c2a32b..b2a5d64 100644 --- a/database/migrations/2025_04_28_101821_create_provinces_table.php +++ b/database/migrations/2025_04_28_101821_create_provinces_table.php @@ -16,6 +16,8 @@ return new class extends Migration $table->string('name'); $table->double('lat'); $table->double('lon'); + $table->string('ip'); + $table->string('camera_ip'); $table->timestamps(); }); }