|
|
|
|
@ -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");
|
|
|
|
|
|