diff --git a/app/Console/Commands/SendContractSmsNotification.php b/app/Console/Commands/SendContractSmsNotification.php
index 8b29c308..7786fb73 100644
--- a/app/Console/Commands/SendContractSmsNotification.php
+++ b/app/Console/Commands/SendContractSmsNotification.php
@@ -46,7 +46,7 @@ class SendContractSmsNotification extends Command
foreach ($contractSubItems as $key => $value) {
$message = "سلام،\n پروژه راهداری با کد یکتای {$value->unique_code} با مسئولیت شما، به مدت بیشتر از یک ماه به روزرسانی نشده است. لطفا نسبت به روز رسانی دقیق پیشرفت پروژه در سامانه اقدام نمایید.\n rms.rmto.ir";
- self::sms_sender($value->operator_phone, $message);
+// self::sms_sender($value->operator_phone, $message);
}
}
diff --git a/app/Enums/MissionStates.php b/app/Enums/MissionStates.php
index 44df6680..7abfdf04 100644
--- a/app/Enums/MissionStates.php
+++ b/app/Enums/MissionStates.php
@@ -15,11 +15,11 @@ enum MissionStates: int
public static function name(int $state): string
{
$mapArray = [
- 1 => 'درخواست ایجاد شد و در حال بررسی توسط واحد نقلیه است',
+ 1 => 'درخواست ایجاد شد و در حال بررسی توسط واحد تایید کننده است',
2 => 'خودرو اختصاص داده شد و درخواست توسط واحد کنترل در حال بررسی است',
3 => 'درخواست توسط واحد کنترل تایید شد و ماموریت آغاز می شود',
4 => 'اتمام ماموریت',
- 5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر',
+ 5 => 'عدم تخصیص خودرو توسط واحد تایید کننده و بازگشت درخواست به کارتابل کاربر',
6 => 'ماموریت لغو شد',
7 => 'ماموریت بدون فرایند ثبت شد'
];
diff --git a/app/Facades/Sms/SmsClass.php b/app/Facades/Sms/SmsClass.php
index ea950944..3ccd09b6 100644
--- a/app/Facades/Sms/SmsClass.php
+++ b/app/Facades/Sms/SmsClass.php
@@ -12,28 +12,28 @@ class SmsClass
{
public function sendSms($mobile, $msg)
{
- if (App::environment('production')) {
-
-
- $client = new SoapClient("http://172.30.5.36/webservice/sms.asmx?WSDL");
- $date = date('d-m-y h:i:s');
- $date = str_replace(" ", "T", $date);
- $result = $client->Send(
- array(
- 'Username' => 'admin',
- 'Password' => 'admin141',
- 'ShortCode' => '1000141',
- 'Cellphones' => $mobile,
- 'Message' => $msg,
- 'Farsi' => true,
- // 'SendDate' => $date
- // 'uTopic' => false,
- // 'uFlash' => false
- )
- );
-
- return $result->SendResult;
- }
+// if (App::environment('production')) {
+//
+//
+// $client = new SoapClient("http://172.30.5.36/webservice/sms.asmx?WSDL");
+// $date = date('d-m-y h:i:s');
+// $date = str_replace(" ", "T", $date);
+// $result = $client->Send(
+// array(
+// 'Username' => 'admin',
+// 'Password' => 'admin141',
+// 'ShortCode' => '1000141',
+// 'Cellphones' => $mobile,
+// 'Message' => $msg,
+// 'Farsi' => true,
+// // 'SendDate' => $date
+// // 'uTopic' => false,
+// // 'uFlash' => false
+// )
+// );
+//
+// return $result->SendResult;
+// }
// $client = new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");
diff --git a/app/Http/Controllers/Api/ContractSubItemsController.php b/app/Http/Controllers/Api/ContractSubItemsController.php
index af3439c0..9f4a0ff1 100644
--- a/app/Http/Controllers/Api/ContractSubItemsController.php
+++ b/app/Http/Controllers/Api/ContractSubItemsController.php
@@ -609,25 +609,25 @@ class ContractSubItemsController extends Controller
]);
}
- public function sms_sender($mobile, $msg)
- {
- $client=new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");
- $result=$client->doSendSMS(
- array(
- 'uUsername' => 'rmto',
- 'uPassword' => 'Rahdari8
- ',
- 'uNumber' => '1000141',
- 'uCellphones' => $mobile,
- 'uMessage' => $msg,
- 'uFarsi' => true,
- 'uTopic' => false,
- 'uFlash' => false
- )
- );
- $x = $result->doSendSMSResult;
- return $x;
- }
+// public function sms_sender($mobile, $msg)
+// {
+// $client=new SoapClient("http://sms1000.ir/webservice/smspro.asmx?WSDL");
+// $result=$client->doSendSMS(
+// array(
+// 'uUsername' => 'rmto',
+// 'uPassword' => 'Rahdari8
+// ',
+// 'uNumber' => '1000141',
+// 'uCellphones' => $mobile,
+// 'uMessage' => $msg,
+// 'uFarsi' => true,
+// 'uTopic' => false,
+// 'uFlash' => false
+// )
+// );
+// $x = $result->doSendSMSResult;
+// return $x;
+// }
public function get_way_id_from_nominatim($lat, $lng)
{
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index beb423c8..858e130d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -434,6 +434,7 @@ class UserController extends Controller
$user->password = Hash::make($request->password);
$user->national_code = $request->national_code;
+ $user->station_id = $request->station_id;
$user->save();
if (auth()->user()) {
diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
index 33e732b0..bcc7e1d9 100644
--- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
@@ -70,19 +70,20 @@ class ControlUnitController extends Controller
'state_name' => MissionStates::name($state),
'finish_time' => $request->time,
'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
+ 'end_km' => $request->end_km,
]);
- $getErrorRateService->setInputParameters($mission);
- $responseData = $getErrorRateService->run();
-
- $mission->update([
- 'in_area_duration' => $responseData['timeInAreaSeconds'],
- 'first_enter' => $responseData['firstEnter'],
- 'last_exit' => $responseData['lastExit'],
- 'point_number_sent' => $responseData['noOfPointsInMission'],
- 'fms_result_code' => $responseData['resultCode'],
- 'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
- ]);
+// $getErrorRateService->setInputParameters($mission);
+// $responseData = $getErrorRateService->run();
+//
+// $mission->update([
+// 'in_area_duration' => $responseData['timeInAreaSeconds'],
+// 'first_enter' => $responseData['firstEnter'],
+// 'last_exit' => $responseData['lastExit'],
+// 'point_number_sent' => $responseData['noOfPointsInMission'],
+// 'fms_result_code' => $responseData['resultCode'],
+// 'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
+// ]);
});
if ($mission->category_id == 2) {
diff --git a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
index 228bf825..ded93c8b 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
@@ -38,6 +38,15 @@ class RoadMaintenanceStationController extends Controller
));
}
+ public function findByCity(Request $request): JsonResponse
+ {
+ $stations = RahdariPoint::query()
+ ->where('city_id', $request->query('city_id'))
+ ->get();
+
+ return $this->successResponse($stations);
+ }
+
/**
* Store a newly created resource in storage.
*/
diff --git a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
index 899b1bb0..bbc1d5b0 100644
--- a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
+++ b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
@@ -25,6 +25,7 @@ class FinishRequest extends FormRequest
{
return [
'time' => 'required|date',
+ 'end_km' => 'required',
];
}
}
diff --git a/app/Services/Cartables/Mission/Report/ReportTradodService.php b/app/Services/Cartables/Mission/Report/ReportTradodService.php
index 2aacae97..341f0430 100644
--- a/app/Services/Cartables/Mission/Report/ReportTradodService.php
+++ b/app/Services/Cartables/Mission/Report/ReportTradodService.php
@@ -37,8 +37,8 @@ class ReportTradodService
-1 AS province_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
- COALESCE(SUM(m.in_area_duration), 0) AS gps,
- COALESCE(SUM(m.mission_duration), 0) AS durations,
+ COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
+ COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -56,8 +56,8 @@ class ReportTradodService
p.id AS province_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
- COALESCE(SUM(m.in_area_duration), 0) AS gps,
- COALESCE(SUM(m.mission_duration), 0) AS durations,
+ COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
+ COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -98,8 +98,8 @@ class ReportTradodService
-1 AS city_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
- COALESCE(SUM(m.in_area_duration), 0) AS gps,
- COALESCE(SUM(m.mission_duration), 0) AS durations,
+ COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
+ COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
COALESCE(SUM(m.type = 1), 0) AS far_h,
COALESCE(SUM(m.type = 2), 0) AS far_d,
COALESCE(SUM(m.type = 3), 0) AS un_far_h,
@@ -118,8 +118,8 @@ class ReportTradodService
c.id AS city_id,
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
- COALESCE(SUM(m.in_area_duration), 0) AS gps,
- COALESCE(SUM(m.mission_duration), 0) AS durations,
+ COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
+ COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
COALESCE(SUM(m.type = 1), 0) AS far_h,
COALESCE(SUM(m.type = 2), 0) AS far_d,
COALESCE(SUM(m.type = 3), 0) AS un_far_h,
diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index cfe90719..b8efeba8 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -27,7 +27,7 @@ class PaymentService
);
$ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, "http://payment.rmto.ir/acc/rest/payid/gen");
+ curl_setopt($ch, CURLOPT_URL, "https://payment.rmto.ir/acc/rest/payid/gen");
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post));
@@ -59,7 +59,7 @@ class PaymentService
);
$ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, "http://payment.rmto.ir/acc/rest/payid/track2/" . env("PAYMENT_USERNAME") . "/" . env("PAYMENT_PASSWORD") . "/" . $bill_code);
+ curl_setopt($ch, CURLOPT_URL, "https://payment.rmto.ir/acc/rest/payid/track2/" . env("PAYMENT_USERNAME") . "/" . env("PAYMENT_PASSWORD") . "/" . $bill_code);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
// curl_setopt($ch, CURLOPT_POST, true);
// curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post));
diff --git a/database/migrations/2026_05_18_102119_add_end_km_to_missions_table.php b/database/migrations/2026_05_18_102119_add_end_km_to_missions_table.php
new file mode 100644
index 00000000..ecf5de6b
--- /dev/null
+++ b/database/migrations/2026_05_18_102119_add_end_km_to_missions_table.php
@@ -0,0 +1,29 @@
+string('end_km')->nullable();
+
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('missions', function (Blueprint $table) {
+ $table->dropColumn('end_km');
+ });
+ }
+};
diff --git a/resources/views/receipt/insurance_letter.blade.php b/resources/views/receipt/insurance_letter.blade.php
index 9e10dfe0..962c45f9 100644
--- a/resources/views/receipt/insurance_letter.blade.php
+++ b/resources/views/receipt/insurance_letter.blade.php
@@ -125,11 +125,13 @@
$(document).ready(function() {
$(".letter-body").find("#accident_date").text(moment(jsonServer.data.accident_date).format(
"jYYYY/jMM/jDD"));
- const plaque = jsonServer.data.plaque.split("-");
- $("#plaque1").text(plaque[0]);
- $("#plaque2").text(plaque[1]);
- $("#plaque3").text(plaque[2]);
- $("#plaque4").text(plaque[3]);
+ const plaque = jsonServer?.data?.plaque?.split("-");
+ if (plaque) {
+ $("#plaque1").text(plaque[0]);
+ $("#plaque2").text(plaque[1]);
+ $("#plaque3").text(plaque[2]);
+ $("#plaque4").text(plaque[3]);
+ }
let row_counter;
let i;
for (i = 0; i < damages.length; i++) {
diff --git a/resources/views/version2/dashboard_pages/road_patrols/operation_create.blade.php b/resources/views/version2/dashboard_pages/road_patrols/operation_create.blade.php
index 62546115..c0633708 100644
--- a/resources/views/version2/dashboard_pages/road_patrols/operation_create.blade.php
+++ b/resources/views/version2/dashboard_pages/road_patrols/operation_create.blade.php
@@ -38,7 +38,7 @@
- --}}
@@ -86,7 +86,7 @@
-
+
diff --git a/routes/v3.php b/routes/v3.php
index d17d2bd0..0ed1219e 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -475,6 +475,7 @@ Route::prefix('road_maintenance_station')
Route::get('/', 'index')->name('index')->middleware('permission:show-tollhouse|show-tollhouse-province');
Route::post('/', 'store')->name('store');
Route::get('/map', 'map')->name('map');
+ Route::get('/search_by_city', 'findByCity')->name('findByCity');
Route::get('/images/{rahdariPoint}', 'images')->name('images');
Route::get('/{rahdariPoint}', 'show')->name('show')->middleware('permission:show-tollhouse|show-tollhouse-province');
Route::post('/{rahdariPoint}', 'update')->name('update')->middleware('permission:edit-tollhouse|edit-tollhouse-province');
@@ -537,7 +538,7 @@ Route::prefix('missions')
});
Route::prefix('report_violation')
->name('reportsViolation.')
- ->middleware(['permission:mission-report-province', 'permission:mission-report-country'])
+ ->middleware(['permission:mission-report-province|permission:mission-report-country'])
->controller(ReportViolationController::class)
->group(function () {
Route::get('/country_activity', 'countryActivity')->name('countryActivity');
@@ -547,7 +548,7 @@ Route::prefix('missions')
});
Route::prefix('report_taradod')
->name('reportsTaradod.')
- ->middleware(['permission:mission-report-province', 'permission:mission-report-country'])
+ ->middleware(['permission:mission-report-province|permission:mission-report-country'])
->controller(ReportTradodController::class)
->group(function () {
Route::get('/country_activity', 'countryActivity')->name('countryActivity');