show related harim

This commit is contained in:
2025-08-05 15:13:14 +03:30
parent ec5d01be85
commit eac948829c
2 changed files with 6 additions and 4 deletions

View File

@@ -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,

View File

@@ -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
]);
}
/**