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

Merge pull request 'add driver_id and driver_name in mission' (#11) from feature/AddDriverInMission into develop

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
amirghasempoor
2026-06-10 07:46:30 +00:00
parent a8b99706d0 235111ee57
commit 6ae3fd3d90
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
View File

@@ -15,7 +15,8 @@ class AllocateRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value;
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
|| $this->user()?->username === 'witel';
}
/**

3
app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php
View File

@@ -14,7 +14,8 @@ class DeallocateRequest extends FormRequest
public function authorize(): bool
{
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id &&
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]);
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
|| $this->user()?->username === 'witel';
}
/**