From df04125cb4c8dd6b83f2a97529e57110993f33c6 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Wed, 3 Sep 2025 16:28:32 +0330 Subject: [PATCH 1/2] fix last code --- app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php | 5 +---- app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php | 6 +----- app/Services/Cartables/RoadPatrol/OperatorService.php | 4 ++-- .../2025_09_03_095512_add_phone_to_rahdaran_table.php | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php index 1263bb97..df5ef422 100644 --- a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php +++ b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php @@ -53,10 +53,7 @@ class StoreRequest extends FormRequest function (Validator $validator) { $mission = Mission::find($this->mission_id); - if (!$mission) { - $validator->errors()->add('mission_id', 'مأموریت یافت نشد.'); - return; - } + $startTime = Carbon::parse($mission->start_time); $finishTime = Carbon::parse($mission->finish_time); $activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}"); diff --git a/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php index a169d836..f2a2d1bb 100644 --- a/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php +++ b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php @@ -6,7 +6,6 @@ use App\Models\Mission; use Carbon\Carbon; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; use Illuminate\Validation\Validator; class UpdateRequest extends FormRequest @@ -58,10 +57,7 @@ class UpdateRequest extends FormRequest function (Validator $validator) { $mission = Mission::find($this->mission_id); - if (!$mission) { - $validator->errors()->add('mission_id', 'مأموریت یافت نشد.'); - return; - } + $startTime = Carbon::parse($mission->start_time); $finishTime = Carbon::parse($mission->finish_time); $activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}"); diff --git a/app/Services/Cartables/RoadPatrol/OperatorService.php b/app/Services/Cartables/RoadPatrol/OperatorService.php index 2b8b3188..ce754c57 100644 --- a/app/Services/Cartables/RoadPatrol/OperatorService.php +++ b/app/Services/Cartables/RoadPatrol/OperatorService.php @@ -12,8 +12,8 @@ class OperatorService public function dataTable(Request $request, $loadRelations = false) { $query = RoadPatrol::query() - ->where('operator_id', '=', auth()->user()->id); -// ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); + ->where('operator_id', '=', auth()->user()->id) + ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); return DataTableFacade::run( $query, diff --git a/database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php b/database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php index 82a96ff1..b6bb1c24 100644 --- a/database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php +++ b/database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php @@ -12,7 +12,7 @@ return new class extends Migration public function up(): void { Schema::table('rahdaran', function (Blueprint $table) { - $table->char('mobile', 11)->nullable(); + $table->string('mobile', 11)->nullable(); }); } From 719139635783ff0159d820c73903778af55a84f8 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sat, 6 Sep 2025 09:46:48 +0330 Subject: [PATCH 2/2] change form request --- app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php | 3 +-- app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php index df5ef422..4b26a498 100644 --- a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php +++ b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php @@ -52,7 +52,7 @@ class StoreRequest extends FormRequest return [ function (Validator $validator) { - $mission = Mission::find($this->mission_id); + $mission = Mission::query()->find($this->mission_id); $startTime = Carbon::parse($mission->start_time); $finishTime = Carbon::parse($mission->finish_time); @@ -64,5 +64,4 @@ class StoreRequest extends FormRequest } ]; } - } diff --git a/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php index f2a2d1bb..1aeacae0 100644 --- a/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php +++ b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php @@ -56,7 +56,7 @@ class UpdateRequest extends FormRequest return [ function (Validator $validator) { - $mission = Mission::find($this->mission_id); + $mission = Mission::query()->find($this->mission_id); $startTime = Carbon::parse($mission->start_time); $finishTime = Carbon::parse($mission->finish_time);