diff --git a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php index faf9bc38..445db4ad 100644 --- a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php +++ b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php @@ -317,7 +317,7 @@ class RoadItemsProjectController extends Controller $road_item = RoadItemsProject::store(Auth::user(), $attributes, $before_image, $after_image, $request->observed_item_id); - if ($road_item == -1) { + if ($road_item === -1) { return response()->json([ 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' ], 400); diff --git a/app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php index 19cfdc01..b41e55ab 100644 --- a/app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php +++ b/app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php @@ -413,7 +413,7 @@ class RoadPatrolProjectController extends Controller $road_item = RoadItemsProject::store(auth()->user(), $attributes, $before_image, $after_image, $observed_item->id); - if ($road_item == -1) { + if ($road_item === -1) { return response()->json([ 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' ], 400); diff --git a/app/Http/Controllers/V3/RoadItemsProjectController.php b/app/Http/Controllers/V3/RoadItemsProjectController.php index b9fb7875..0c264762 100644 --- a/app/Http/Controllers/V3/RoadItemsProjectController.php +++ b/app/Http/Controllers/V3/RoadItemsProjectController.php @@ -40,7 +40,7 @@ class RoadItemsProjectController extends Controller 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', - 'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' + 'cmms_machine_id', 'cmms_machine_code' ); $allowedFilters = $columns; @@ -148,7 +148,7 @@ class RoadItemsProjectController extends Controller 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', - 'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' + 'cmms_machine_id', 'cmms_machine_code' ); $allowedFilters = $columns; @@ -249,13 +249,14 @@ class RoadItemsProjectController extends Controller $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id); - $road_item->rahdaran()->attach($request->rahdaran_id); - - if ($road_item == -1) { + if ($road_item === -1) { return response()->json([ 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' ], 400); } + + $road_item->rahdaran()->attach($request->rahdaran_id); + auth()->user()->addActivityComplete(1154); return $this->successResponse(); diff --git a/app/Models/RoadItemsProject.php b/app/Models/RoadItemsProject.php index faa14780..9c3c5ef0 100644 --- a/app/Models/RoadItemsProject.php +++ b/app/Models/RoadItemsProject.php @@ -100,7 +100,6 @@ class RoadItemsProject extends Model { try { $road_item = \DB::transaction(function () use ($user, $attributes, $before_image, $after_image, $observed_item_id) { -// dd($attributes['cmms_machine_id'],$attributes['cmms_machine_code']); $road_item = $user->roadItemsProjects()->create([ 'start_lat' => $attributes['start_lat'], 'start_lng' => $attributes['start_lng'],