From 729d48ac5a0e647410ca8f203673a58a5bfbdfa2 Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Thu, 2 Apr 2026 09:26:42 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=97=D0=B0=D1=8F=D0=B2=D0=BA=D0=B8=20-?=
 =?UTF-8?q?=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80,=20=D0=BF=D0=BE=D0=BB=D1=83?=
 =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D0=B8,=20null-safe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Номер заявки вместо организации в списке
✅ Столбец Получатели (пользователи/группы/организации)
✅ Null-safe для organization, user, group
✅ Бейджи с названиями в show.blade.php

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 .../admin/course-requests/index.blade.php     | 23 +++++++++++++++++--
 .../admin/course-requests/show.blade.php      | 10 ++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/resources/views/admin/course-requests/index.blade.php b/resources/views/admin/course-requests/index.blade.php
index dfc74ff..ade9b27 100644
--- a/resources/views/admin/course-requests/index.blade.php
+++ b/resources/views/admin/course-requests/index.blade.php
@@ -44,9 +44,10 @@
                         <table class="table table-hover">
                             <thead>
                                 <tr>
-                                    <th>Организация</th>
+                                    <th>№</th>
                                     <th>Статус</th>
                                     <th>Курсов</th>
+                                    <th>Получатели</th>
                                     <th>Создана</th>
                                     <th>Кем</th>
                                     <th>Действия</th>
@@ -55,7 +56,7 @@
                             <tbody>
                                 @forelse($requests as $request)
                                 <tr>
-                                    <td><strong>{{ $request->organization?->name ?? 'Без организации' }}</strong></td>
+                                    <td><strong>#{{ $request->id }}</strong></td>
                                     <td>
                                         @if($request->isPending())
                                         <span class="badge bg-warning">Ожидает</span>
@@ -66,6 +67,24 @@
                                         @endif
                                     </td>
                                     <td><span class="badge bg-info">{{ $request->items->count() }}</span></td>
+                                    <td>
+                                        @php
+                                            $recipients = [];
+                                            if ($request->items->where('user_id')->count() > 0) {
+                                                $recipients[] = '<span class="badge bg-success"><i class="bi bi-person"></i> ' . $request->items->where('user_id')->count() . '</span>';
+                                            }
+                                            if ($request->items->where('group_id')->count() > 0) {
+                                                $recipients[] = '<span class="badge bg-info"><i class="bi bi-people"></i> ' . $request->items->where('group_id')->count() . '</span>';
+                                            }
+                                            if ($request->items->where('organization_id')->count() > 0) {
+                                                $recipients[] = '<span class="badge bg-primary"><i class="bi bi-building"></i> ' . $request->items->where('organization_id')->count() . '</span>';
+                                            }
+                                            if (empty($recipients)) {
+                                                $recipients[] = '<span class="text-muted">—</span>';
+                                            }
+                                        @endphp
+                                        {!! implode(' ', $recipients) !!}
+                                    </td>
                                     <td><small>{{ $request->created_at->format('d.m.Y H:i') }}</small></td>
                                     <td>{{ $request->requestedBy?->name ?? 'Удалён' }}</td>
                                     <td>
diff --git a/resources/views/admin/course-requests/show.blade.php b/resources/views/admin/course-requests/show.blade.php
index e7bd3d6..4984f50 100644
--- a/resources/views/admin/course-requests/show.blade.php
+++ b/resources/views/admin/course-requests/show.blade.php
@@ -28,7 +28,7 @@
                     <div class="card shadow-sm">
                         <div class="card-header bg-primary text-white"><h5 class="mb-0">Информация</h5></div>
                         <div class="card-body">
-                            <div><strong>Организация:</strong> {{ $courseRequest->organization->name }}</div>
+                            <div><strong>Организация:</strong> {{ $courseRequest->organization?->name ?? 'Без организации' }}</div>
                             <div><strong>Статус:</strong>
                                 @if($courseRequest->isPending())
                                 <span class="badge bg-warning">Ожидает</span>
@@ -103,13 +103,13 @@
                                     </td>
                                     <td>
                                         @if($item->user_id)
-                                        {{ $item->user?->name ?? '—' }}
+                                        <span class="badge bg-success">{{ $item->user?->name ?? 'Пользователь #' . $item->user_id }}</span>
                                         @elseif($item->group_id)
-                                        {{ $item->group?->name ?? '—' }}
+                                        <span class="badge bg-info">{{ $item->group?->name ?? 'Группа #' . $item->group_id }}</span>
                                         @elseif($item->organization_id)
-                                        {{ $item->organization?->name ?? '—' }}
+                                        <span class="badge bg-primary">{{ $item->organization?->name ?? 'Организация #' . $item->organization_id }}</span>
                                         @else
-                                        {{ $courseRequest->organization->name }}
+                                        <span class="text-muted">—</span>
                                         @endif
                                     </td>
                                     <td>