From f7f1134ce3ed45ca5e845b8a5cf89a5b8e7f6678 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sun, 31 Aug 2025 13:52:59 +0330 Subject: [PATCH] change some code for some thing such as mission accident and enum --- app/Enums/MissionTypes.php | 14 ++++++++------ .../Accident/AccidentReceiptController.php | 6 +++--- .../Dashboard/Mission/RequestPortalController.php | 6 +++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/Enums/MissionTypes.php b/app/Enums/MissionTypes.php index 356fbd33..f50c9e2d 100644 --- a/app/Enums/MissionTypes.php +++ b/app/Enums/MissionTypes.php @@ -4,16 +4,18 @@ namespace App\Enums; enum MissionTypes: int { - case SAATY= 1; - case ROZANE = 2; - case NO_PROCESS = 3; + case PROCESS_SAATY= 1; + case PROCESS_ROZANE = 2; + case NO_PROCESS_SAATY = 3; + case NO_PROCESS_ROZANE = 4; public static function name(int $state): string { $mapArray = [ - 1 => 'ساعتی', - 2 => 'روزانه', - 3 => 'بدون فرآیند', + 1 => ' با فرایند (ساعتی)', + 2 => 'با فرایند(روزانه)', + 3 => 'بدون فرآیند(ساعتی)', + 4 => 'بدون فرایند (روزانه)' ]; return $mapArray[$state]; diff --git a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php index e210d9da..6e44793f 100644 --- a/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php +++ b/app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php @@ -263,13 +263,13 @@ class AccidentReceiptController extends Controller $status_fa = AccidentStates::name($status); } - $accident->update([ + $accident->update([ 'deposit_insurance_image' => $request->has('deposit_insurance_image') ? FileFacade::save($request->deposit_insurance_image, "receipts_files/{$accident->id}/deposit_insurance") : null, '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 2a97eb99..d490db4a 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -15,6 +15,7 @@ use App\Http\Traits\ApiResponse; use App\Models\Mission; use App\Models\RoadObserved; use App\Services\Cartables\Mission\RequestPortalService; +use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -127,9 +128,12 @@ class RequestPortalController extends Controller public function noProcess(NoProcessRequest $request): JsonResponse { DB::transaction(function () use ($request) { + + $start = Carbon::parse($request->start_date); + $end = Carbon::parse($request->end_date); + $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value; $user = auth()->user(); $zone= $request->zone; - $type= MissionTypes::NO_PROCESS->value; $state = MissionStates::END_MISSION->value; $mission = Mission::query()->create([