payment/backend
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

feature/ForgotPassword #29

Closed
faezeh wants to merge 91 commits from feature/ForgotPassword into main
pull from: feature/ForgotPassword
merge into: payment:main
Conversation 0 Commits 91 Files Changed 223 +13 -8
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 581e7af1fd - Show all commits

2
backend/app/Admin/Controllers/ExpertManagementController.php
View File

@@ -67,6 +67,8 @@ class ExpertManagementController extends Controller
*/ */
public function show(Expert $expert): JsonResponse public function show(Expert $expert): JsonResponse
{ {
$expert->load('roles', 'permissions');
return $this->successResponse( return $this->successResponse(
new ExpertManagementResource($expert) new ExpertManagementResource($expert)
); );

2
backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php
View File

@@ -27,7 +27,7 @@ class UpdateRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'name' => ['required', 'string', 'max:255', Rule::unique('permission', 'name')->ignore($this->permission->id)], 'name' => ['required', 'string', 'max:255', Rule::unique('permissions', 'name')->ignore($this->permission->id)],
]; ];
} }
} }

4
backend/app/Admin/Requests/RoleManagement/StoreRequest.php
View File

@@ -24,8 +24,8 @@ class StoreRequest extends FormRequest
{ {
return [ return [
'name' => 'required|string|unique:roles,name', 'name' => 'required|string|unique:roles,name',
'permissions' => 'required|array', 'permissions' => 'array',
'permissions.*.name' => 'required|string|exists:permissions,name', 'permissions.*' => 'integer|exists:permissions,id',
]; ];
} }
} }

6
backend/app/Admin/Requests/RoleManagement/UpdateRequest.php
View File

@@ -27,9 +27,9 @@ class UpdateRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)], 'name' => ['string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
'permissions' => 'required|array', 'permissions' => 'array',
'permissions.*.name' => 'required|string|exists:permissions,name', 'permissions.*' => 'integer|exists:permissions,id',
]; ];
} }
} }

4
backend/app/Admin/Resources/ExpertManagementResource.php
View File

@@ -28,11 +28,11 @@ class ExpertManagementResource extends JsonResource
'phone_number' => $this->phone_number, 'phone_number' => $this->phone_number,
'province_name' => $this->province_name, 'province_name' => $this->province_name,
'city_name' => $this->city_name, 'city_name' => $this->city_name,
'roles' => $this->roles() 'roles' => $this->resource->roles
->pluck('name') ->pluck('name')
->values(), ->values(),
'permissions' => $this->getAllPermissions() 'permissions' => $this->resource->getAllPermissions()
->pluck('name') ->pluck('name')
->values(), ->values(),
]; ];

3
backend/app/Models/Expert.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use Database\Factories\ExpertFactory; use Database\Factories\ExpertFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Spatie\Permission\Traits\HasRoles;
/** /**
* @method roles() * @method roles()
@@ -14,6 +15,8 @@ class Expert extends Model
{ {
/** @use HasFactory<ExpertFactory> */ /** @use HasFactory<ExpertFactory> */
use HasFactory; use HasFactory;
use HasRoles;
protected $guarded = ['id']; protected $guarded = ['id'];
protected string $guard_name = 'web';
} }