diff --git a/app/Http/Controllers/Admin/CourseRequestController.php b/app/Http/Controllers/Admin/CourseRequestController.php index efe53f9..2fca551 100755 --- a/app/Http/Controllers/Admin/CourseRequestController.php +++ b/app/Http/Controllers/Admin/CourseRequestController.php @@ -58,7 +58,6 @@ class CourseRequestController extends Controller Gate::authorize('create', CourseRequest::class); $validated = $request->validate([ - 'organization_id' => 'nullable|exists:organizations,id', 'status' => 'nullable|in:pending,approved,rejected', 'note' => 'nullable|string', 'items_json' => 'required|string', @@ -81,8 +80,9 @@ class CourseRequestController extends Controller DB::beginTransaction(); try { - // Определяем организацию из первого элемента или общую - $organizationId = $validated['organization_id'] ?? null; + // Берём organization_id из первого элемента или null + $firstItem = reset($items); + $organizationId = $firstItem['organization_id'] ?? null; // Создаём заявку $courseRequest = CourseRequest::create([ diff --git a/resources/views/admin/course-requests/index.blade.php b/resources/views/admin/course-requests/index.blade.php index e679507..dfc74ff 100644 --- a/resources/views/admin/course-requests/index.blade.php +++ b/resources/views/admin/course-requests/index.blade.php @@ -55,7 +55,7 @@ @forelse($requests as $request) - {{ $request->organization->name }} + {{ $request->organization?->name ?? 'Без организации' }} @if($request->isPending()) Ожидает