debug intern mistakes

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,

app/Http/Requests/V3/RoadObservation/RegisterRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests\V3\RoadObservation;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RegisterRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|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',
+        ];
+    }
+}

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

resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php

@@ -26,15 +26,18 @@
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">استان</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">شهرستان</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">نام محور</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">نام راننده</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">کد ملی راننده</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">شماره موبایل راننده</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">پلاک</th>
         <th style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">نوع تصادف</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">تاریخ تصادف</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">مبلغ کل خسارت</th>
-        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">پلاک</th>
-        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">تاریخ ثبت</th>
-        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">آخرین وضعیت</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">مبلغ فیش</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">مبلغ بیمه</th>
         <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">مبلغ داغی</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">تاریخ ثبت</th>
+        <th  style="border: 1px solid black;text-align: center;background-color: #EBF1DE;">وضعیت</th>
     </tr>
     </thead>
 
@@ -45,15 +48,18 @@
             <td style="border: 1px solid black;text-align: center;">{{$item->province_fa}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->city_fa}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->axis_name}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->driver_name}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->driver_national_code}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->driver_phone_number}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->plaque}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->accident_type_fa}}</td>
             <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j')}} {{$item->accident_time}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->sum ?? 0}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{$item->plaque}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{$item->status_fa}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->final_amount ?? 0}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->deposit_insurance_amount ?? 0}}</td>
             <td style="border: 1px solid black;text-align: center;">{{$item->deposit_daghi_amount ?? 0}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->status_fa}}</td>
         </tr>
     @endforeach
     </tbody>

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');