From eac948829ccb924a7f485d06149ebb09a04bb1bb Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Tue, 5 Aug 2025 15:13:14 +0330 Subject: [PATCH] show related harim --- .../V3/Dashboard/Harim/GeneralManagerController.php | 5 ++--- .../V3/Dashboard/Harim/GeneralManager/ShowRequest.php | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php index a25ed97f..04c1ad76 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php @@ -25,10 +25,9 @@ class GeneralManagerController extends Controller use ApiResponse; public function index(Request $request): JsonResponse { - $user = auth()->user(); $query = Harim::query() - ->where('state_id', '=', HarimStates::BARESI_TAVASOT_MODIR_KOL->value) - ->where('edareh_shahri_id', '=', $user->edarate_shahri_id); + ->whereIn('state_id', [HarimStates::BARESI_TAVASOT_MODIR_KOL->value, HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value]) + ->where('edareh_shahri_id', '=', auth()->user()->edarate_shahri_id); $data = DataTableFacade::run( $query, diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ShowRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ShowRequest.php index 186523b1..47e8bdce 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ShowRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ShowRequest.php @@ -13,7 +13,10 @@ class ShowRequest extends FormRequest public function authorize(): bool { return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && - $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Modir_Kol->value; + in_array($this->harim->state_id, [ + HarimStates::BARESI_TAVASOT_MODIR_KOL->value, + HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value + ]); } /**