diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 43e9b865..91788a8e 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -100,7 +100,10 @@ class RequestPortalController extends Controller $mission->rahdaran()->sync($request->rahdaran); if ($request->category_id == 3){ - $mission->roadObserved()->attach($request->road_observed_id); + RoadObserved::query() + ->find($request->road_observed_id) + ->missions() + ->sync($mission->id); } }); diff --git a/app/Models/Mission.php b/app/Models/Mission.php index 3f29202d..1328e9ee 100644 --- a/app/Models/Mission.php +++ b/app/Models/Mission.php @@ -13,6 +13,7 @@ class Mission extends Model use HasFactory; protected $guarded = []; + protected $hidden = ['pivot']; protected function requestedMachines(): Attribute { diff --git a/app/Models/RoadObserved.php b/app/Models/RoadObserved.php index 16d30d16..3b9f3449 100644 --- a/app/Models/RoadObserved.php +++ b/app/Models/RoadObserved.php @@ -77,6 +77,7 @@ class RoadObserved extends Model 'rms_start_latlng' => 'array', 'rms_end_latlng' => 'array' ]; + protected $hidden = ['pivot']; /** * Get all of the project's files. diff --git a/app/Services/Cartables/Mission/RequestPortalService.php b/app/Services/Cartables/Mission/RequestPortalService.php index ca765a5e..fcd160af 100644 --- a/app/Services/Cartables/Mission/RequestPortalService.php +++ b/app/Services/Cartables/Mission/RequestPortalService.php @@ -15,7 +15,7 @@ class RequestPortalService public function datatable(Request $request) { $user = auth()->user(); - $query = Mission::query(); + $query = Mission::query()->with('roadObserved:id'); if ($user->hasPermissionTo('manage-request-portal-city')) { $query->where('edare_shahri_id', '=', $user->edarate_shahri_id);