payment/backend
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from witelgroup/feature/FixLastCode

Browse Source 
fix store request for road item
This commit is contained in:
faezehzafarbakhsh
2025-09-02 13:47:59 +03:30
committed by GitHub
parent 5aba0fc3c4 2e52ef9cad
commit 69f88d7f6e
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
View File

@@ -123,8 +123,6 @@ class OperatorController extends Controller
new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.')
);
$road_item->rahdaran()->attach($request->rahdaran_id);
$road_item->cmmsMachines()->attach($request->machines_id);
$road_item->missions()->attach($request->mission_id);
$user->addActivityComplete(1154);

16
app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
View File

@@ -6,8 +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\ValidationException;
use Illuminate\Validation\Validator;
class StoreRequest extends FormRequest
@@ -38,10 +36,6 @@ class StoreRequest extends FormRequest
'activity_time' => 'required|date_format:H:i',
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'machines_id' => 'required|array',
'machines_id.*' => 'required|exists:cmms_machines,id',
'rahdaran_id' => 'required|array',
'rahdaran_id.*' => 'required|exists:rahdaran,id',
];
}
@@ -52,18 +46,24 @@ class StoreRequest extends FormRequest
'activity_time' => 'ساعت فعالیت',
];
}
public function after(): array
{
return [
function (Validator $validator) {
$mission = Mission::find($this->mission_id);
if (!$mission) {
$validator->errors()->add('mission_id', 'مأموریت یافت نشد.');
return;
}
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");
if ($activityTime->lt($this->mission->start_date) || $activityTime->gt($this->mission->end_date)) {
if ($activityTime->lt($mission->start_date) || $activityTime->gt($mission->end_date)) {
$validator->errors()->add('activity_time', 'زمان گزارش باید بین بازه مأموریت باشد.');
}
}
];
}
}