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

remove the nested array

Browse Source
This commit is contained in:
amirghasempoor
2025-01-26 10:09:22 +03:30
parent 2e10afa5eb
commit 01a30c763c
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
View File

@@ -252,7 +252,7 @@ class RoadItemsReportController extends Controller
$request->toDate,
);
$name = "گزارش کشوری از فعالیت روزانه و جاری({}) - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivityPerSubItemReport($activities), $name);
}
@@ -268,7 +268,7 @@ class RoadItemsReportController extends Controller
$request->province_id
);
$name = "گزارش استانی از فعالیت روزانه و جاری({}) - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivityPerSubItemReport($activities), $name);
}

16
app/Services/Reports/RoadItemReportService.php
View File

@@ -37,14 +37,12 @@ class RoadItemReportService
];
foreach ($subItems as $subItem) {
$totalItemCount[] = [
"total_count_{$subItem->sub_item}" => $activities->sum("Count_{$subItem->sub_item}"),
"total_sum_{$subItem->sub_item}" => $activities->sum("Sum_{$subItem->sub_item}"),
];
$totalItemCount["Count_{$subItem->sub_item}"] = $activities->sum("Count_{$subItem->sub_item}");
$totalItemCount["Sum_{$subItem->sub_item}"] = $activities->sum("Sum_{$subItem->sub_item}");
}
return [
'data' => $activities->push($totalItemCount),
'data' => $activities->push((object)$totalItemCount),
'fromDate' => $fromDate,
'toDate' => $toDate,
'details' => $subItems->keyBy('sub_item'),
@@ -81,14 +79,12 @@ class RoadItemReportService
];
foreach ($subItems as $subItem) {
$totalItemCount[] = [
"total_count_{$subItem->sub_item}" => $activities->sum("Count_{$subItem->sub_item}"),
"total_sum_{$subItem->sub_item}" => $activities->sum("Sum_{$subItem->sub_item}"),
];
$totalItemCount["Count_{$subItem->sub_item}"] = $activities->sum("Count_{$subItem->sub_item}");
$totalItemCount["Sum_{$subItem->sub_item}"] = $activities->sum("Sum_{$subItem->sub_item}");
}
return collect([
'data' => $activities->push($totalItemCount),
'data' => $activities->push((object)$totalItemCount),
'fromDate' => $fromDate,
'toDate' => $toDate,
'details' => $subItems->keyBy('sub_item')