From 679421792ccc49efdecf6ede9ec331aa6e123b89 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Fri, 13 Mar 2026 16:16:13 +0300
Subject: [PATCH] =?utf8?q?feat(ERP-256):=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?utf8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?=
 =?utf8?q?=20=C2=AB=D0=B7=D0=B0=20=D0=BF=D1=80=D0=BE=D1=88=D0=BB=D1=8B?=
 =?utf8?q?=D0=B9=20=D0=BC=D0=B5=D1=81=D1=8F=D1=86=C2=BB=20=D0=BD=D0=B0=20?=
 =?utf8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D0=BE=D1=88?=
 =?utf8?q?=D0=B8=D0=B1=D0=BA=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Добавлен $buttonParams2 с диапазоном дат прошлого месяца.
Кнопка отображается рядом с «за неделю» при ошибке cs1.
---
 erp24/services/CabinetService.php | 23 ++++++++++++++++++++---
 erp24/views/cabinet/error.php     | 10 ++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php
index 18067d6f..9070b45e 100755
--- a/erp24/services/CabinetService.php
+++ b/erp24/services/CabinetService.php
@@ -760,7 +760,15 @@ class CabinetService
                 'name' => 'за неделю',
             ];
 
-            $outputCheckError = $this->outputCheckError($errorText, $buttonParams, $controller);
+            $dateFromLastMonth = date("Y-m-01", strtotime("-1 month"));
+            $dateToLastMonth = date("Y-m-t", strtotime("-1 month"));
+
+            $buttonParams2 = [
+                'url' => "/cabinet/person?DaysSearchForm[employeeId]=" . $employeeId . "&DaysSearchForm[dateFrom]=" . $dateFromLastMonth . "&DaysSearchForm[dateTo]=" . $dateToLastMonth,
+                'name' => 'за прошлый месяц',
+            ];
+
+            $outputCheckError = $this->outputCheckError($errorText, $buttonParams, $controller, $buttonParams2);
             if (!empty($outputCheckError)) {
                 if (array_key_exists('errorText', $outputCheckError)) {
                     return [
@@ -2282,7 +2290,15 @@ class CabinetService
                 'name' => 'за неделю',
             ];
 
-            $outputCheckError = $this->outputCheckError($errorText, $buttonParams, $controller);
+            $dateFromLastMonth = date("Y-m-01", strtotime("-1 month"));
+            $dateToLastMonth = date("Y-m-t", strtotime("-1 month"));
+
+            $buttonParams2 = [
+                'url' => "/cabinet/person?DaysSearchForm[employeeId]=" . $employeeId . "&DaysSearchForm[dateFrom]=" . $dateFromLastMonth . "&DaysSearchForm[dateTo]=" . $dateToLastMonth,
+                'name' => 'за прошлый месяц',
+            ];
+
+            $outputCheckError = $this->outputCheckError($errorText, $buttonParams, $controller, $buttonParams2);
             if (!empty($outputCheckError)) {
                 if (array_key_exists('errorText', $outputCheckError)) {
                     return [
@@ -6536,7 +6552,7 @@ Group BY admin_id
     }
 
 
-    public function outputCheckError(string $errorText, $buttonParams, $controller)
+    public function outputCheckError(string $errorText, $buttonParams, $controller, $buttonParams2 = [])
     {
         if (empty($controller)) {
             return [
@@ -6546,6 +6562,7 @@ Group BY admin_id
             echo $controller->render('/cabinet/error', [
                 'errorText' => $errorText,
                 'buttonParams' => $buttonParams,
+                'buttonParams2' => $buttonParams2,
             ]);
             die();
         }
diff --git a/erp24/views/cabinet/error.php b/erp24/views/cabinet/error.php
index 347c0dc7..4d0cb1a6 100755
--- a/erp24/views/cabinet/error.php
+++ b/erp24/views/cabinet/error.php
@@ -22,6 +22,9 @@ if (empty($hideButton)) {
 if (empty($buttonParams)) {
     $buttonParams = [];
 }
+if (empty($buttonParams2)) {
+    $buttonParams2 = [];
+}
 ?>
 
 
@@ -49,6 +52,13 @@ if (empty($buttonParams)) {
 
                 echo Html::a($buttonName, $buttonUrl, ['class' => 'btn btn-success']);
             }
+
+            if (!empty($buttonParams2)) {
+                $buttonUrl2 = ArrayHelper::getValue($buttonParams2, 'url');
+                $buttonName2 = ArrayHelper::getValue($buttonParams2, 'name');
+                echo ' ';
+                echo Html::a($buttonName2, $buttonUrl2, ['class' => 'btn btn-info']);
+            }
             ?>
         </div>
     </div>
-- 
2.39.5