From d8cf9460634bda333c8f16f60207003f55eb59cf Mon Sep 17 00:00:00 2001 From: fomichev Date: Tue, 14 Jan 2025 13:43:30 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=20=D0=B4=D0=BB?= =?utf8?q?=D1=8F=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20?= =?utf8?q?=D0=BC=D0=B5=D1=81=D1=8F=D1=86=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C?= =?utf8?q?=D0=BA=D0=BE=20=D0=BD=D0=B0=20=D1=82=D0=B5=D0=BA=D1=83=D1=89?= =?utf8?q?=D1=83=D1=8E=20=D0=B4=D0=B0=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/UsersMessageManagementController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php index fda7cf37..0e8aaee7 100644 --- 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); -- 2.39.5