Показ для текущего месяца только на текущую дату

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index fda7cf377d3d57596a7cae3411279165fb12c3db..0e8aaee7fecd6538d5f0d028fb43fbea2354db3d 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -58,7 +58,7 @@ class UsersMessageManagementController extends Controller
         $year = date('Y');
 
         $startDate = date('Y-m-d', strtotime("$year-$month-01"));
-        $endDate = date('Y-m-t', strtotime($startDate));
+        $endDate = date('Y-m-d');
 
         $dates = [];
         $currentDate = strtotime($startDate);
@@ -153,7 +153,11 @@ class UsersMessageManagementController extends Controller
         $year = $request->get('year', date('Y'));
 
         $startDate = date('Y-m-d', strtotime("$year-$month-01"));
-        $endDate = date('Y-m-t', strtotime($startDate)); // Последний день месяца
+        if ($month == date('m') && $year == date('Y')) {
+            $endDate = date('Y-m-d');
+        } else {
+            $endDate = date('Y-m-t', strtotime($startDate));
+        }
 
         $dates = [];
         $currentDate = strtotime($startDate);