bugfix
This commit is contained in:
@@ -138,7 +138,7 @@ class RoadItemsReportController extends Controller
|
|||||||
->unionAll($roadItemsProjectsSummaryQuery)
|
->unionAll($roadItemsProjectsSummaryQuery)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
$provinces = Province::all(['id', 'name']);
|
$provinces = Province::all(['id', 'name_fa']);
|
||||||
|
|
||||||
return $this->successResponse([
|
return $this->successResponse([
|
||||||
'activities' => $data,
|
'activities' => $data,
|
||||||
@@ -176,7 +176,7 @@ class RoadItemsReportController extends Controller
|
|||||||
->unionAll($roadItemsProjectsSummaryQuery)
|
->unionAll($roadItemsProjectsSummaryQuery)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
$edarateShahri = EdarateShahri::all(['id', 'name'])->where('province_id', $provinceId);
|
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name']);
|
||||||
|
|
||||||
return $this->successResponse([
|
return $this->successResponse([
|
||||||
'activities' => $data,
|
'activities' => $data,
|
||||||
|
|||||||
Reference in New Issue
Block a user