1

2 years ago · 3455fa8153
parent 54c19be680
commit 3455fa8153
2 changed files with 10 additions and 7 deletions
--- 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"));

    }
--- a/resources/views/admin/orders/artboard.blade.php
+++ b/resources/views/admin/orders/artboard.blade.php
@ -26,14 +26,14 @@
                        </thead>
                        <tbody>
                        @foreach ($data as $row)
-                            <tr data-id="{{$row->id}}">
-                                <td>{{ $row->project->name }}</td>
-                                <td>{{ $row->name }}</td>
+                            <tr data-id="{{$row['id']}}">
+                                <td>{{ $row['project']['name'] }}</td>
+                                <td>{{ $row['name'] }}</td>
                                <td>
-                                    @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}}--}}

                                        <br/>
                                    @endforeach