From 2c843eaeabe4c6a26266285ff8be068a711272fc Mon Sep 17 00:00:00 2001
From: faezehzafarbakhsh <faezehzafarbakhsh@gmail.com>
Date: Sun, 21 Dec 2025 09:02:03 +0330
Subject: [PATCH] fix time

---
 .../Cartables/Mission/ReportService.php       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/Services/Cartables/Mission/ReportService.php b/app/Services/Cartables/Mission/ReportService.php
index 03808c9a..1a50d4a6 100644
--- a/app/Services/Cartables/Mission/ReportService.php
+++ b/app/Services/Cartables/Mission/ReportService.php
@@ -28,21 +28,8 @@ class ReportService
 
     public function countryActivity(Request $request): array
     {
-        $from = null;
-        $to   = null;
-
-        $filters = json_decode($request->filters ?? '[]', true);
-
-        foreach ($filters as $filter) {
-            if (($filter['fn'] ?? null) === 'between' && ($filter['id'] ?? null) === 'created_at') {
-                $from = ($filter['value'][0] ?? null) ? ($filter['value'][0] . ' 00:00:00') : null;
-                $to   = ($filter['value'][1] ?? null) ? ($filter['value'][1] . ' 23:59:59') : null;
-                break;
-            }
-        }
-
-        $from ??= '1970-01-01 00:00:00';
-        $to   ??= now()->endOfDay()->toDateTimeString();
+        $from = $request->from_date ?? today()->startOfDay();
+        $to   = $request->to_date ?? today()->endOfDay();
 
         $sql = "
         WITH r AS (
@@ -96,7 +83,7 @@ class ReportService
         ]);
     }
 
-    public function provinceActivity(Request $request, int $info_id): array
+    public function provinceActivity(Request $request, int $info_id)
     {
         //
     }