diff --git a/app/Http/Controllers/Admin/CourseRequestController.php b/app/Http/Controllers/Admin/CourseRequestController.php index d321830..d26f86c 100755 --- a/app/Http/Controllers/Admin/CourseRequestController.php +++ b/app/Http/Controllers/Admin/CourseRequestController.php @@ -178,7 +178,7 @@ class CourseRequestController extends Controller { Gate::authorize('view', $courseRequest); - $courseRequest->load(['organization', 'requestedBy', 'approvedBy', 'items.course', 'items.user', 'items.group']); + $courseRequest->load(['organization', 'requestedBy', 'approvedBy', 'items.course', 'items.user', 'items.group', 'items.organization']); return view('admin.course-requests.show', compact('courseRequest')); } diff --git a/app/Models/CourseRequestItem.php b/app/Models/CourseRequestItem.php index 5a23612..b6d7694 100755 --- a/app/Models/CourseRequestItem.php +++ b/app/Models/CourseRequestItem.php @@ -44,6 +44,11 @@ class CourseRequestItem extends Model return $this->belongsTo(Group::class); } + public function organization(): BelongsTo + { + return $this->belongsTo(Organization::class); + } + public function getTypeAttribute(): string { if ($this->user_id) { diff --git a/resources/views/admin/course-requests/show.blade.php b/resources/views/admin/course-requests/show.blade.php index 14af752..836c40c 100644 --- a/resources/views/admin/course-requests/show.blade.php +++ b/resources/views/admin/course-requests/show.blade.php @@ -95,8 +95,10 @@ Индивидуально @elseif($item->group_id) Группе - @else + @elseif($item->organization_id) Организации + @else + Организации заявки @endif @@ -104,6 +106,8 @@ {{ $item->user?->name ?? '—' }} @elseif($item->group_id) {{ $item->group?->name ?? '—' }} + @elseif($item->organization_id) + {{ $item->organization?->name ?? '—' }} @else {{ $courseRequest->organization->name }} @endif