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

rename

Browse Source
This commit is contained in:
amirghasempoor
2025-02-09 14:08:03 +03:30
parent ce28ec9f93
commit 6cda8f04c6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
View File

@@ -53,7 +53,7 @@ class RoadPatrolReportController extends Controller
public function countryActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
{
$activities = $roadPatrolReportService->countryActivity($request->from_date, $request->to_date);
$activities = $roadPatrolReportService->countryActivity($request->from_date, $request->date_to);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
@@ -62,7 +62,7 @@ class RoadPatrolReportController extends Controller
public function provinceActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
{
$activities = $roadPatrolReportService->provinceActivity($request->from_date, $request->to_date, $request->province_id);
$activities = $roadPatrolReportService->provinceActivity($request->from_date, $request->date_to, $request->province_id);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
@@ -71,7 +71,7 @@ class RoadPatrolReportController extends Controller
public function activitiesOnMap(Request $request): JsonResponse
{
$date_from = $request->date_from ? $request->date_from .' 00:00:00' : now()->startOfDay()->toDateTimeString();
$date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
$date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
$provinceId = $request->province_id;
$edareId = $request->edare_id;

4
app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
View File

@@ -281,8 +281,8 @@ class RoadPatrolProjectController extends Controller
$status = $request->status;
$rms_status = $request->rms_status;
if ($request->date_from && $request->date_to) {
$date_from = $request->date_from.' 00:00:00';
if ($request->from_date && $request->date_to) {
$date_from = $request->from_date.' 00:00:00';
$date_to = $request->date_to.' 23:59:59';
} else {
$date_from = Date('Y-m-d');

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

@@ -76,7 +76,7 @@ class RoadItemReportService
public function countryActivityPerSubItem(Request $request): array
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item;
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
@@ -114,7 +114,7 @@ class RoadItemReportService
public function provinceActivityPerSubItem(Request $request): array
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item;
$province = $request->province_id;
@@ -159,7 +159,7 @@ class RoadItemReportService
public function countryActivityPerItem(Request $request): array
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->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 = $user->hasPermissionTo("show-road-item-supervise-cartable");
@@ -198,7 +198,7 @@ class RoadItemReportService
{
$provinceId = $request->province_id;
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$edarehActivity = RoadItemsProject::query()
->selectRaw('