update

app/Http/Controllers/Api/V1/OrderController.php

@@ -497,7 +497,7 @@ class OrderController extends AuthController
         ]);
         $user = $this->user;
 
-        $data = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack', 'orderNurse', 'orderVaccine', 'organization.docter'])->where('id', $req['order_id'])->where('user_id', $user['id'])->first();
+        $data = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack.team.docter', 'orderNurse', 'orderVaccine', 'organization.docter'])->where('id', $req['order_id'])->where('user_id', $user['id'])->first();
 
         return out($data);
     }

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -16,15 +16,21 @@ class OrganizationController extends AuthController
 {
     public function organizationList()
     {
+        $req = request()->post();
         $this->validate(request(), [
             'latitude' => 'numeric',
             'longitude' => 'numeric',
+            'city_id' => 'integer',
         ]);
         $user = $this->user;
 
         $distance_field = get_user_distance_field($user);
 
-        $data = Organization::with('docter')->select(['id', 'type', 'name', 'province_id', 'city_id', 'area_id', 'address', 'latitude', 'longitude', DB::raw($distance_field)])->orderBy('distance', 'asc')->paginate();
+        $builder = Organization::with('docter')->select(['id', 'type', 'name', 'province_id', 'city_id', 'area_id', 'address', 'latitude', 'longitude', DB::raw($distance_field)]);
+        if (!empty($req['city_id'])) {
+            $builder->where('city_id', $req['city_id']);
+        }
+        $data = $builder->orderBy('distance', 'asc')->paginate();
 
         return out($data);
     }

app/Models/OrderPack.php

@@ -10,5 +10,8 @@ namespace App\Models;
 
 class OrderPack extends BaseModel
 {
-
+    public function team()
+    {
+        return $this->belongsTo(Team::class);
+    }
 }