From d9ee1ca3516ac1de35b4d4637dc7c33183b6c054 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Wed, 7 May 2025 13:41:10 +0330
Subject: [PATCH] rmove extra role columns

---
 app/Http/Controllers/Admin/UserManagementController.php | 3 +--
 app/Http/Controllers/ProvinceController.php             | 1 -
 app/Http/Resources/Admin/UserResource.php               | 2 +-
 app/Models/User.php                                     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserManagementController.php b/app/Http/Controllers/Admin/UserManagementController.php
index ab8725e..be1e8c6 100644
--- a/app/Http/Controllers/Admin/UserManagementController.php
+++ b/app/Http/Controllers/Admin/UserManagementController.php
@@ -28,11 +28,10 @@ class UserManagementController extends Controller
 
         $allowedSortings = $columns;
 
-        $allowedRelations = array('roles');
+        $allowedRelations = array('roles:id,name_fa');
 
         $query = User::query()->where('username', "<>", "witel");
 
-
         $data = DataTableFacade::run(
             $query,
             $request,
diff --git a/app/Http/Controllers/ProvinceController.php b/app/Http/Controllers/ProvinceController.php
index 5e2f4f3..6ab542f 100644
--- a/app/Http/Controllers/ProvinceController.php
+++ b/app/Http/Controllers/ProvinceController.php
@@ -14,6 +14,5 @@ class ProvinceController extends Controller
     public function list(): JsonResponse
     {
         return $this->successResponse(Province::all('id', 'name'));
-
     }
 }
diff --git a/app/Http/Resources/Admin/UserResource.php b/app/Http/Resources/Admin/UserResource.php
index c53f084..7f81196 100644
--- a/app/Http/Resources/Admin/UserResource.php
+++ b/app/Http/Resources/Admin/UserResource.php
@@ -25,7 +25,7 @@ class UserResource extends JsonResource
             'position' => $this->position,
             'province_id' => $this->province_id,
             'province_name' => $this->province_name,
-            'role' => $this->getRoleNames()->first(),
+            'role' => $this->roles->pluck('id', 'name_fa'),
             'telephone_id' => $this->telephone_id
         ];
     }
diff --git a/app/Models/User.php b/app/Models/User.php
index 94702a7..f3f3154 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -15,7 +15,7 @@ class User extends Authenticatable
 
     protected $guarded = [];
 
-    protected $hidden = ['password'];
+    protected $hidden = ['password', 'pivot'];
     public string $guard_name = 'web';
 
     public function storeFile($file, $name)