diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index 2a71d58..3e788d5 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -250,6 +250,9 @@ class OrdersController extends CommonController $data = $data->filter(function ($item) { return $item->beds->count(); }); + if ($data->isEmtpy()) { + $data = $data->toArray(); + } return view($this->bladePath . ".artboard", compact("data", "projects", "project_id")); } diff --git a/resources/views/admin/orders/artboard.blade.php b/resources/views/admin/orders/artboard.blade.php index 13b0364..5fc4f8d 100644 --- a/resources/views/admin/orders/artboard.blade.php +++ b/resources/views/admin/orders/artboard.blade.php @@ -26,14 +26,14 @@ @foreach ($data as $row) - - {{ $row->project->name }} - {{ $row->name }} + + {{ $row['project']['name'] }} + {{ $row['name'] }} - @foreach ($row->beds as $r) -{{-- {{json_encode($r)}}--}} -{{-- 【{{$r->name}}-】--}} - {{$r->on_going_order}} + @foreach ($row['beds'] as $r) + {{json_encode($r)}} + {{-- 【{{$r->name}}-】--}} +{{-- {{$r->on_going_order}}--}}
@endforeach