develop #7

Merged
amirghasempoor merged 87 commits from develop into main 2026-05-23 07:38:16 +00:00
2 changed files with 8 additions and 0 deletions
Showing only changes of commit a126ac674c - Show all commits

View File

@@ -50,6 +50,8 @@ class RequestPortalController extends Controller
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id ?? null,
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'state_id' => $state,
@@ -123,6 +125,8 @@ class RequestPortalController extends Controller
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id ?? null,
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'state_id' => $state,
@@ -216,6 +220,8 @@ class RequestPortalController extends Controller
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id ?? null,
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'zone' => $zone,

View File

@@ -51,6 +51,8 @@ class ViolationManagementController extends Controller
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id ?? null,
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'zone' => $zone,