Compare commits
2 Commits
2a6d44885c
...
3dd49494f4
| Author | SHA1 | Date | |
|---|---|---|---|
| 3dd49494f4 | |||
| 3045f60f1e |
@@ -134,7 +134,7 @@ class RequestPortalController extends Controller
|
||||
// $rpc->store($mission);
|
||||
// }
|
||||
|
||||
$machine = CMMSMachine::query()->find($request->machine_id);
|
||||
$machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
|
||||
|
||||
$newMission = Mission::query()->create([
|
||||
'user_id' => $user->id,
|
||||
@@ -168,7 +168,7 @@ class RequestPortalController extends Controller
|
||||
'driver_id' => $request->driver,
|
||||
'driver_name' => Rahdaran::query()->find($request->driver)->name,
|
||||
'km' => $request->end_km,
|
||||
'requested_machines' => json_encode($mission->requested_machines),
|
||||
'requested_machines' => json_encode($machine->car_type),
|
||||
]);
|
||||
|
||||
$newMission->rahdaran()->sync($request->rahdaran);
|
||||
@@ -244,7 +244,7 @@ class RequestPortalController extends Controller
|
||||
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
|
||||
$user = auth()->user();
|
||||
$zone = $request->zone;
|
||||
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
|
||||
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
|
||||
|
||||
$mission = Mission::query()->create([
|
||||
'user_id' => $user->id,
|
||||
@@ -274,7 +274,7 @@ class RequestPortalController extends Controller
|
||||
'request_date' => now(),
|
||||
'machine_id' => $machine->id,
|
||||
'machine_code' => $machine->machine_code,
|
||||
'requested_machines' => $machine->car_type,
|
||||
'requested_machines' => json_encode($machine->car_type),
|
||||
'station_id' => $user->station_id,
|
||||
'station_name' => RahdariPoint::query()->find($user->station_id)->name,
|
||||
'km' => $violation->km ?? null,
|
||||
|
||||
Reference in New Issue
Block a user