RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from witelgroup/feature/FixLastCode

Browse Source 
change some code for some thing such as mission accident and enum
This commit is contained in:
Amir Ghasempoor
2025-08-31 13:56:31 +03:30
committed by GitHub
parent 46355edc2f f7f1134ce3
commit 5aba0fc3c4
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Enums/MissionTypes.php
View File

@@ -4,16 +4,18 @@ namespace App\Enums;
enum MissionTypes: int enum MissionTypes: int
{ {
case SAATY= 1; case PROCESS_SAATY= 1;
case ROZANE = 2; case PROCESS_ROZANE = 2;
case NO_PROCESS = 3; case NO_PROCESS_SAATY = 3;
case NO_PROCESS_ROZANE = 4;
public static function name(int $state): string public static function name(int $state): string
{ {
$mapArray = [ $mapArray = [
1 => 'ساعتی', 1 => ' با فرایند (ساعتی)',
2 => 'روزانه', 2 => 'با فرایند(روزانه)',
3 => 'بدون فرآیند', 3 => 'بدون فرآیند(ساعتی)',
4 => 'بدون فرایند (روزانه)'
]; ];
return $mapArray[$state]; return $mapArray[$state];

6
app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php
View File

@@ -263,13 +263,13 @@ class AccidentReceiptController extends Controller
$status_fa = AccidentStates::name($status); $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_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_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_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, 'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0,
'status' => $status, 'status' => $status,
'status_fa' => $status_fa, 'status_fa' => $status_fa,
]); ]);
auth()->user()->addActivityComplete(1132); auth()->user()->addActivityComplete(1132);

6
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -15,6 +15,7 @@ use App\Http\Traits\ApiResponse;
use App\Models\Mission; use App\Models\Mission;
use App\Models\RoadObserved; use App\Models\RoadObserved;
use App\Services\Cartables\Mission\RequestPortalService; use App\Services\Cartables\Mission\RequestPortalService;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
@@ -127,9 +128,12 @@ class RequestPortalController extends Controller
public function noProcess(NoProcessRequest $request): JsonResponse public function noProcess(NoProcessRequest $request): JsonResponse
{ {
DB::transaction(function () use ($request) { 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(); $user = auth()->user();
$zone= $request->zone; $zone= $request->zone;
$type= MissionTypes::NO_PROCESS->value;
$state = MissionStates::END_MISSION->value; $state = MissionStates::END_MISSION->value;
$mission = Mission::query()->create([ $mission = Mission::query()->create([