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(); }); }