diff --git a/app/Http/Controllers/V3/ProfileController.php b/app/Http/Controllers/V3/ProfileController.php index 930a2f0a..008ec6e7 100644 --- a/app/Http/Controllers/V3/ProfileController.php +++ b/app/Http/Controllers/V3/ProfileController.php @@ -30,6 +30,7 @@ class ProfileController extends Controller 'major' => $user->major, 'degree' => $user->degree, 'mobile' => $user->mobile, + 'province_id' => $user->province_id, 'avatar' => $user->avatarUrl() ]); } diff --git a/app/Http/Controllers/V3/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Reports/RoadItemsReportController.php index 24e7c32c..fd4b1fe8 100644 --- a/app/Http/Controllers/V3/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Reports/RoadItemsReportController.php @@ -113,7 +113,8 @@ class RoadItemsReportController extends Controller $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString(); $user = auth()->user(); - $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']); +// $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']); + $isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable"); $provinceId = $isSpecialUser ? null : $user->province_id; $roadItemsProjectsQuery = RoadItemsProject::query() @@ -176,7 +177,7 @@ class RoadItemsReportController extends Controller ->unionAll($roadItemsProjectsSummaryQuery) ->get(); - $edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name']); + $edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']); return $this->successResponse([ 'activities' => $data,