|
|
|
|
@ -220,7 +220,6 @@ class OrdersController extends CommonController
|
|
|
|
|
}
|
|
|
|
|
})->where('admin_id', $user->id)->pluck('area_id');
|
|
|
|
|
}
|
|
|
|
|
dd($areaId);
|
|
|
|
|
$data = Area::where(function ($query) use ($areaId) {
|
|
|
|
|
if ($areaId) {
|
|
|
|
|
$query->whereIn('id', $areaId);
|
|
|
|
|
@ -240,7 +239,7 @@ class OrdersController extends CommonController
|
|
|
|
|
->orderBy("bed.name");
|
|
|
|
|
}])->whereRaw("`area`.`project_id` = '{$request->project_id}'")
|
|
|
|
|
->orderBy("building.myindex")
|
|
|
|
|
->orderBy("area.myindex")
|
|
|
|
|
->orderBy("area1.myindex")
|
|
|
|
|
->select("area.id", "area.name", "area.building_id", "area.project_id")
|
|
|
|
|
->leftJoin("building", "area.building_id", "=", "building.id")
|
|
|
|
|
->addSelect("building.name as building_name")
|
|
|
|
|
|