From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 14 Jan 2025 10:43:30 +0000 (+0300)
Subject: Показ для текущего месяца только на текущую дату
X-Git-Tag: 1.7~81^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d8cf9460634bda333c8f16f60207003f55eb59cf;p=erp24_rep%2Fyii-erp24%2F.git

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

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);