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

bugfix nikarayan

Browse Source
This commit is contained in:
amirghasempoor
2025-06-09 10:53:35 +03:30
parent 049f0bf70e
commit 0954da3dd5
8 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/V2/Dashboard/RoadObservationController.php
View File

@@ -570,7 +570,7 @@ class RoadObservationController extends Controller
// }
// $url = "https://riws.rmto.ir/WebServices/NRPTrafficStatus.asmx?wsdl";
try {
$result = $nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, $files);
$result = $nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, $files_path);
} catch (SoapFault $e) {
$msg = "error in send to nikarayan at" . date("Y-m-d H:i:s") . "\n" . 'rms: error in get road observation webservice babe!!!!' . "\n";

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

@@ -32,8 +32,8 @@ class RequestPortalController extends Controller
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'edare_shahri_id' => $user->edare_shahri_id ?? null,
'edare_shahri_name' => $user->edare_shahri_name ?? null,
'edare_shahri_id' => $user->edare_shahri_id ?? null,
'edare_shahri_name' => $user->edare_shahri_name ?? null,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'requested_machines' => json_encode($request->requested_machines),
@@ -56,20 +56,20 @@ class RequestPortalController extends Controller
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
public function update(UpdateRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission->update([
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machines' => json_encode($request->requested_machines),
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'end_point' => $request->end_point,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'requested_machines' => json_encode($request->requested_machines),
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);

4
app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
View File

@@ -35,8 +35,8 @@ class TransportationUnitController extends Controller
$state = MissionStates::PENDING_CONFIRMATION->value;
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'state_id' => $state,
'state_name' => MissionStates::name($state),
]);
});

10
app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php
View File

@@ -82,10 +82,9 @@ class OperatorController
'new_files' => json_encode([])
];
$files_path = [];
if ($request->rms_status == 1) {
$files_path = [];
$roadObserved->files()->where('path', 'like', '%_image_before%')->delete();
$roadObserved->files()->where('path', 'like', '%_image_after%')->delete();
@@ -95,7 +94,6 @@ class OperatorController
$files_path[0]['path'] = $image_before;
$files_path[1]['path'] = $image_after;
$files = json_encode($files_path);
$now_date_time = Carbon::now();
$roadObservedData['image_after'] = $image_after;
@@ -104,16 +102,16 @@ class OperatorController
$roadObservedData['updated_at_fa'] = Verta::instance($now_date_time);
$roadObservedData['rms_last_activity_fa'] = Verta::instance($now_date_time);
$roadObservedData['rms_last_activity'] = $now_date_time;
$roadObservedHistoryData['new_files'] = $files;
$roadObservedHistoryData['new_files'] = json_encode($files_path);
}
DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $request, $nikarayanService) {
DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $request, $nikarayanService, $files_path) {
$roadObserved->problemHistories()->create($roadObservedHistoryData);
$roadObserved->update($roadObservedData);
auth()->user()->addActivityComplete(1142);
$nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, json_encode($roadObservedHistoryData['new_files']));
$nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, $files_path);
});
return $this->successResponse();