diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservationController.php b/app/Http/Controllers/V3/Dashboard/RoadObservationController.php index c8a52bdc..00b39cab 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadObservationController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadObservationController.php @@ -8,6 +8,7 @@ use App\Facades\File\FileFacade; use App\Facades\Sms\Sms; use App\Http\Controllers\Controller; use App\Http\Requests\V3\RoadObservation\ReferRequest; +use App\Http\Requests\V3\RoadObservation\RegisterRequest; use App\Http\Requests\V3\RoadObservation\RestoreRequest; use App\Http\Requests\V3\RoadObservation\VerifyBySupervisorRequest; use App\Http\Traits\ApiResponse; @@ -85,7 +86,7 @@ class RoadObservationController extends Controller return Excel::download(new ComplaintsReport($data['data']), $name); } - public function register(Request $request, RoadObserved $roadObserved, NikarayanService $nikarayanService): JsonResponse + public function register(RegisterRequest $request, RoadObserved $roadObserved, NikarayanService $nikarayanService): JsonResponse { $roadObservedData = [ 'status' => 0, diff --git a/app/Http/Requests/V3/RoadObservation/RegisterRequest.php b/app/Http/Requests/V3/RoadObservation/RegisterRequest.php new file mode 100644 index 00000000..68f93dae --- /dev/null +++ b/app/Http/Requests/V3/RoadObservation/RegisterRequest.php @@ -0,0 +1,32 @@ +|string> + */ + public function rules(): array + { + return [ + 'rms_status' => 'required|in:1,2', + 'rms_description' => 'required_if:rms_status,1|string', + 'image_before' => 'required_if:rms_status,1|file|mimes:jpg,jpeg,png', + 'image_after' => 'required_if:rms_status,1|file|mimes:jpg,jpeg,png', + 'start_point' => 'required_if:rms_status,1|string', + ]; + } +} diff --git a/app/Services/DataTable/Filter/ApplyFilter.php b/app/Services/DataTable/Filter/ApplyFilter.php index 971abccb..60ac88ea 100644 --- a/app/Services/DataTable/Filter/ApplyFilter.php +++ b/app/Services/DataTable/Filter/ApplyFilter.php @@ -66,7 +66,7 @@ class ApplyFilter } $relation = $this->filter->getRelation(); - return $relation ? $this->applyFilterToRelation($relation) : $this->searchFilter->apply(); + return method_exists($this->query->getModel(), $relation) ? $this->applyFilterToRelation($relation) : $this->searchFilter->apply(); } protected function applyFilterToRelation(string $relation): Builder diff --git a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php index 5d0a85fd..134166b1 100644 --- a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php @@ -26,15 +26,18 @@ استان شهرستان نام محور + نام راننده + کد ملی راننده + شماره موبایل راننده + پلاک نوع تصادف تاریخ تصادف مبلغ کل خسارت - پلاک - تاریخ ثبت - آخرین وضعیت مبلغ فیش مبلغ بیمه مبلغ داغی + تاریخ ثبت + وضعیت @@ -45,15 +48,18 @@ {{$item->province_fa}} {{$item->city_fa}} {{$item->axis_name}} + {{$item->driver_name}} + {{$item->driver_national_code}} + {{$item->driver_phone_number}} + {{$item->plaque}} {{$item->accident_type_fa}} {{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j')}} {{$item->accident_time}} {{$item->sum ?? 0}} - {{$item->plaque}} - {{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}} - {{$item->status_fa}} {{$item->final_amount ?? 0}} {{$item->deposit_insurance_amount ?? 0}} {{$item->deposit_daghi_amount ?? 0}} + {{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}} + {{$item->status_fa}} @endforeach diff --git a/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php b/resources/views/v3/Reports/RoadObservation/OperatorCartableReport.blade.php similarity index 100% rename from resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php rename to resources/views/v3/Reports/RoadObservation/OperatorCartableReport.blade.php diff --git a/routes/v3.php b/routes/v3.php index f4e235f0..f03cfe2e 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -282,7 +282,7 @@ Route::prefix('road_observations') ->controller(RoadObservationController::class) ->group(function () { Route::get('/supervisor_index', 'supervisorIndex')->name('supervisorIndex')->middleware('permission:show-fast-react-province|show-fast-react'); - Route::post('/verify/{road_observed}', 'verifyBySupervisor')->name('verifyBySupervisor'); + Route::post('/verify/{roadObserved}', 'verifyBySupervisor')->name('verifyBySupervisor'); Route::get('/supervisor_report', 'supervisorCartableReport')->name('supervisorCartableReport')->middleware('permission:show-fast-react-province|show-fast-react'); Route::get('/operator_index','operatorIndex')->name('operatorIndex')->middleware('permission:show-fast-react-edarate-shahri'); Route::get('/operator_report','operatorCartableReport')->name('operatorCartableReport')->middleware('permission:show-fast-react-edarate-shahri');