From 38b2f043bf6f3e804e77ee4965af14ba8d4cebc8 Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Wed, 1 Apr 2026 16:19:56 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=80=D0=B3=D0=B0=D0=BD=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=20=D1=8D=D0=BB=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B7=D0=B0=D1=8F=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ organization relationship в CourseRequestItem
✅ Отображение в show.blade.php
✅ Загрузка в контроллере

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 app/Http/Controllers/Admin/CourseRequestController.php | 2 +-
 app/Models/CourseRequestItem.php                       | 5 +++++
 resources/views/admin/course-requests/show.blade.php   | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

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 @@
                                         <span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
                                         @elseif($item->group_id)
                                         <span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
-                                        @else
+                                        @elseif($item->organization_id)
                                         <span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
+                                        @else
+                                        <span class="badge bg-secondary"><i class="bi bi-building"></i> Организации заявки</span>
                                         @endif
                                     </td>
                                     <td>
@@ -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