From 0995b005613c72b0a20a282fbb9383de9f840578 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sat, 31 May 2025 17:10:55 +0330 Subject: [PATCH] debog code --- app/Exports/V3/RoadObservation/ComplaintsReport.php | 2 +- .../V3/Dashboard/Accident/AccidentReceiptController.php | 5 +++-- app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php | 1 + .../v3/Reports/AccidentReceipt/DataTableReport.blade.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Exports/V3/RoadObservation/ComplaintsReport.php b/app/Exports/V3/RoadObservation/ComplaintsReport.php index e8012634..4484b4b0 100644 --- a/app/Exports/V3/RoadObservation/ComplaintsReport.php +++ b/app/Exports/V3/RoadObservation/ComplaintsReport.php @@ -61,7 +61,7 @@ class ComplaintsReport implements FromView, WithEvents, ShouldAutoSize, WithDraw $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('q1'); + $drawing2->setCoordinates('J1'); return [$drawing, $drawing2]; } } diff --git a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php index a871ca0b..1620ca78 100644 --- a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php +++ b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php @@ -131,6 +131,7 @@ class AccidentReceiptController extends Controller $city = City::query()->where('id', '=', $request->city_id)->first(); $accidentData = [ + 'is_foreign' => $request->is_foreign, 'province_id' => $province->id, 'province_fa' => $province->name_fa, 'city_id' => $city->id, @@ -157,8 +158,8 @@ class AccidentReceiptController extends Controller FileFacade::delete($accident->police_file, true); } - if (!$request->report_base && $request->has('police_file')) { - FileFacade::delete($accident->police_file, true); + if ($request->has('police_file')) { + if ($accident->police_file) {FileFacade::delete($accident->police_file, true);} $accidentData['police_file'] = FileFacade::save($request->file('police_file'), "receipts_files/{$accident->id}/"); } diff --git a/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php b/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php index c73a9bc8..134bb4a0 100644 --- a/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php +++ b/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php @@ -23,6 +23,7 @@ class UpdateRequest extends FormRequest public function rules(): array { return [ + 'is_foreign' => 'required|boolean', 'province_id' => 'required|integer|exists:provinces,id', 'city_id' => 'required|integer|exists:cities,id', 'axis_name' => 'required|string', diff --git a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php index 308f8aa5..0f2f2ecf 100644 --- a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php @@ -49,7 +49,7 @@ {{$item->province_fa}} {{$item->city_fa}} {{$item->axis_name}} - {{$item->is_foreign ? 'داخلی' : 'خارجی'}} + {{$item->is_foreign ? 'خارجی' : 'داخلی'}} {{$item->driver_name}} {{$item->driver_national_code}} {{$item->driver_phone_number}}