add driver_id and driver_name in mission
This commit is contained in:
@@ -16,6 +16,7 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Models\CMMSMachine;
|
||||
use App\Models\Mission;
|
||||
use App\Models\Rahdaran;
|
||||
use App\Models\RahdariPoint;
|
||||
use App\Models\RoadObserved;
|
||||
use App\Services\Cartables\Mission\RequestPortalService;
|
||||
@@ -43,6 +44,10 @@ class RequestPortalController extends Controller
|
||||
DB::transaction(function () use ($request) {
|
||||
$user = auth()->user();
|
||||
|
||||
$driver = Rahdaran::query()
|
||||
->whereIn('id','=', $request->rahdaran)
|
||||
->where('is_driver', '=',1)
|
||||
->first();
|
||||
$state = MissionStates::REQUEST_CREATED->value;
|
||||
$category = $request->category_id;
|
||||
|
||||
@@ -74,6 +79,8 @@ class RequestPortalController extends Controller
|
||||
'code' => rand(100000, 999999),
|
||||
'station_id' => $user->station_id,
|
||||
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
|
||||
'driver_id' => $driver->id,
|
||||
'driver_name' => $driver->name,
|
||||
]);
|
||||
|
||||
$mission->rahdaran()->sync($request->rahdaran);
|
||||
|
||||
@@ -5,8 +5,8 @@ namespace App\Http\Controllers\V3\Dashboard\Mission;
|
||||
use App\Enums\CmmsMachineStatus;
|
||||
use App\Enums\MissionStates;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\Mission\TransportaionUnit\AllocateRequest;
|
||||
use App\Http\Requests\V3\Mission\TransportaionUnit\DeallocateRequest;
|
||||
use App\Http\Requests\V3\Mission\TransportationUnit\AllocateRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Models\CMMSMachine;
|
||||
use App\Models\Mission;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\V3\Mission\TransportaionUnit;
|
||||
namespace App\Http\Requests\V3\Mission\TransportationUnit;
|
||||
|
||||
use App\Enums\MissionStates;
|
||||
use App\Models\Mission;
|
||||
@@ -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';
|
||||
}
|
||||
|
||||
/**
|
||||
Reference in New Issue
Block a user