diff --git a/src/app/Admin/Controllers/OrderController.php b/src/app/Admin/Controllers/OrderController.php index 25bc192d..6d2e7915 100644 --- a/src/app/Admin/Controllers/OrderController.php +++ b/src/app/Admin/Controllers/OrderController.php @@ -86,13 +86,15 @@ protected function grid() $grid->column('user_addr', 'Адрес'); $grid->column('payment.name', 'Способ оплаты'); $grid->column('delivery.name', 'Способ доставки'); - $grid->column('adminCommentsCollection', 'Коммент')->display(fn () => '💬')->expand(function ($model) { - $comments = $model->adminComments->map(function ($comment) { - return $comment->only(['created_at', 'comment']); - }); + $grid->column('adminCommentsCollection', 'Коммент') + ->display(fn () => count($this->adminComments) ? '💬' : null) + ->display(fn ($value, $row) => count($this->adminComments) ? $row->expand(function ($model) { + $comments = $model->adminComments->map(function ($comment) { + return $comment->only(['created_at', 'comment']); + }); - return new Table(['Дата создания', 'Коммент'], $comments->toArray()); - }); + return new Table(['Дата создания', 'Коммент'], $comments->toArray()); + }) : null); $grid->column('status_key', 'Статус')->editable('select', $orderStatuses); $grid->column('admin_id', 'Менеджер')->editable('select', $admins);