From 1447176a549c0565cee45be53582c6fe40332169 Mon Sep 17 00:00:00 2001 From: Oneami Date: Mon, 23 Oct 2023 22:34:35 +0300 Subject: [PATCH 1/2] 141. Hide icon if comment is empty --- src/app/Admin/Controllers/OrderController.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/Admin/Controllers/OrderController.php b/src/app/Admin/Controllers/OrderController.php index 25bc192d..c1c98b89 100644 --- a/src/app/Admin/Controllers/OrderController.php +++ b/src/app/Admin/Controllers/OrderController.php @@ -86,13 +86,14 @@ 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']); - }); - - return new Table(['Дата создания', 'Коммент'], $comments->toArray()); - }); + $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()); + }) : null); $grid->column('status_key', 'Статус')->editable('select', $orderStatuses); $grid->column('admin_id', 'Менеджер')->editable('select', $admins); From dfaa691fa618acdacbfd3e587f81e9c53b7befd9 Mon Sep 17 00:00:00 2001 From: Oneami Date: Mon, 23 Oct 2023 19:36:41 +0000 Subject: [PATCH 2/2] Format Oneami code --- src/app/Admin/Controllers/OrderController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/Admin/Controllers/OrderController.php b/src/app/Admin/Controllers/OrderController.php index c1c98b89..6d2e7915 100644 --- a/src/app/Admin/Controllers/OrderController.php +++ b/src/app/Admin/Controllers/OrderController.php @@ -92,6 +92,7 @@ protected function grid() $comments = $model->adminComments->map(function ($comment) { return $comment->only(['created_at', 'comment']); }); + return new Table(['Дата создания', 'Коммент'], $comments->toArray()); }) : null);