From 96bf586604a440c2ca577684038c8aba49d0c181 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sun, 31 Aug 2025 13:21:58 +0330 Subject: [PATCH 1/2] fix some code for some thing such as mission accident and safety privacy --- .../V3/Dashboard/Accident/AccidentReceiptController.php | 4 ++-- .../V3/Dashboard/Mission/RequestPortalController.php | 2 ++ .../Requests/V3/Mission/RequestPortal/NoProcessRequest.php | 1 + app/Services/Cartables/SafetyAndPrivacy/OperatorService.php | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php index 86725e9e..1e083a56 100644 --- a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php +++ b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php @@ -268,8 +268,8 @@ class AccidentReceiptController extends Controller 'deposit_insurance_amount' => $request->deposit_insurance_amount ?? 0, 'deposit_daghi_image' => $request->has('deposit_daghi_image') ? FileFacade::save($request->deposit_daghi_image, "receipts_files/{$accident->id}/deposit_daghi") : null, 'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0, - 'status' => $status, - 'status_fa' => $status_fa, + 'status' => $status, + 'status_fa' => $status_fa, ]); auth()->user()->addActivityComplete(1132); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 21984f90..2a97eb99 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -153,6 +153,8 @@ class RequestPortalController extends Controller 'finish_time' => $request->end_date, 'state_id' => $state, 'state_name' => MissionStates::name($state), + 'explanation' => $request->explanation, + 'request_date' => now(), ]); $mission->rahdaran()->sync($request->rahdaran); diff --git a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php index a7bbea8f..b632adf6 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php @@ -36,6 +36,7 @@ class NoProcessRequest extends FormRequest 'area.type' => 'required|string', 'area.coordinates' => 'required|array', 'category_id' => 'required|in:1,2,3', + 'explanation' => 'required|string', ]; } diff --git a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php index efc94ac3..fec10878 100644 --- a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php +++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php @@ -40,7 +40,7 @@ class OperatorService WITH base AS ( SELECT p.id AS province_id, - p.name AS province_name, + p.name_fa AS province_name, a.id AS axis_type_id, COALESCE(SUM(t.step = 1), 0) AS s1, COALESCE(SUM(t.step = 2), 0) AS s2, From a3d087ac65615d3ac928cd3990affc53ad7aacf2 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sun, 31 Aug 2025 13:22:13 +0330 Subject: [PATCH 2/2] fix some code for some thing such as mission accident and safety privacy --- .../V3/Dashboard/Accident/AccidentReceiptController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php index 1e083a56..e210d9da 100644 --- a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php +++ b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php @@ -269,7 +269,7 @@ class AccidentReceiptController extends Controller 'deposit_daghi_image' => $request->has('deposit_daghi_image') ? FileFacade::save($request->deposit_daghi_image, "receipts_files/{$accident->id}/deposit_daghi") : null, 'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0, 'status' => $status, - 'status_fa' => $status_fa, + 'status_fa' => $status_fa, ]); auth()->user()->addActivityComplete(1132);