1

app/Http/Controllers/Admin/OrdersController.php

@@ -224,13 +224,10 @@ class OrdersController extends CommonController
                 }
             })->where('admin_id', $user->id)->pluck('area_id');
         }
-        $data = Area::where(function ($query) use ($areaId, $project_id) {
+        $data = Area::where(function ($query) use ($areaId) {
             if ($areaId) {
                 $query->whereIn('id', $areaId);
             }
-            if ($project_id) {
-                $query->where('project_id', $project_id);
-            }
         })->with(['project',
             "beds" => function ($query) use ($request) {
                 $query->has("onGoingOrder");
@@ -242,7 +239,7 @@ class OrdersController extends CommonController
                     ->addSelect("room.name as room_name")
                     ->orderBy("room.name")
                     ->orderBy("bed.name");
-            }])->orderBy("building.myindex")
+            }])->whereRaw("`area`.`project_id` = '{$project_id}'")
             ->orderBy("building.myindex")
             ->orderBy("area.myindex")
             ->select("area.id", "area.name", "area.building_id", "area.project_id")