diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index d123a98..e1cb3b3 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -262,10 +262,13 @@ class OrdersController extends CommonController } })->where('admin_id', $user->id)->pluck('area_id'); } - $data = Area::where(function ($query) use ($areaId) { + $data = Area::where(function ($query) use ($areaId,$building_id) { if ($areaId) { $query->whereIn('area.id', $areaId); } + if($building_id){ + $query->where('building_id', $building_id); + } })->with(['project', "beds" => function ($query) use ($request) { $query->has("onGoingOrder"); diff --git a/resources/views/admin/orders/artboard.blade.php b/resources/views/admin/orders/artboard.blade.php index b18ac57..6427e8f 100644 --- a/resources/views/admin/orders/artboard.blade.php +++ b/resources/views/admin/orders/artboard.blade.php @@ -19,8 +19,7 @@