|
|
|
|
@ -245,10 +245,16 @@ class OrdersController extends CommonController
|
|
|
|
|
}])->orderBy("building.myindex")
|
|
|
|
|
->orderBy("area.myindex")
|
|
|
|
|
->select("area.id", "area.name", "area.building_id", "area.project_id")
|
|
|
|
|
->where('beds_count','>',0)
|
|
|
|
|
->leftJoin("building", "area.building_id", "=", "building.id")
|
|
|
|
|
->addSelect("building.name as building_name")
|
|
|
|
|
->withCount("beds")
|
|
|
|
|
->paginate(10);
|
|
|
|
|
// if ($has_ongoing_order) {
|
|
|
|
|
// $areas = $areas->filter(function ($item) {
|
|
|
|
|
// return $item->beds->count();
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
$projects = (new StatisticsController())->_checkProjects();
|
|
|
|
|
return view($this->bladePath . ".artboard", compact("data", "projects", "project_id"));
|
|
|
|
|
|
|
|
|
|
|