From 1abac97801538bba9be091e5b7fb5db5c1bacfb3 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 22 Jan 2026 12:00:51 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
 =?utf8?q?=D0=BE=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/OrderControlReportService.php | 45 ++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/erp24/services/OrderControlReportService.php b/erp24/services/OrderControlReportService.php
index 8e848af0..bbf76327 100644
--- a/erp24/services/OrderControlReportService.php
+++ b/erp24/services/OrderControlReportService.php
@@ -744,7 +744,8 @@ class OrderControlReportService
     public function formatTelegramControlReport(ControlReportResult $result): string
     {
         $lines = [];
-        $lines[] = '*\[ÐÐ¾Ð½ÑÑÐ¾Ð»Ñ MP\]* ÐÑÑÑÑ Ð·Ð° ' . $this->escapeMarkdownV2($result->reportDate) . ' ' . $this->escapeMarkdownV2($result->interval);
+        $intervalWithShift = $this->formatIntervalWithShiftName($result->interval);
+        $lines[] = '*\[ÐÐ¾Ð½ÑÑÐ¾Ð»Ñ MP\]* ÐÑÑÑÑ Ð·Ð° ' . $this->escapeMarkdownV2($result->reportDate) . ' ' . $this->escapeMarkdownV2($intervalWithShift);
         $lines[] = '';
 
         // Ð¡ÐµÐºÑÐ¸Ñ "ÐÐ°Ð²Ð¸Ñ Ð² Ð´Ð¾ÑÑÐ°Ð²ÐºÐµ"
@@ -776,7 +777,7 @@ class OrderControlReportService
     /**
      * Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÑÐµÑ ÑÐ°Ð±Ð»Ð¸ÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼ Ð´Ð»Ñ Telegram (Ð¼Ð¾Ð½Ð¾ÑÐ¸ÑÐ¸Ð½Ð½ÑÐ¹ Ð±Ð»Ð¾Ðº)
      *
-     * Ð¤Ð¾ÑÐ¼Ð°Ñ: | ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ
+     * Ð¤Ð¾ÑÐ¼Ð°Ñ: | ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ | ÐÑÐ¸ÑÐ¸Ð½Ð°
      *
      * @param OrderIssue[] $issues
      * @return string
@@ -785,7 +786,7 @@ class OrderControlReportService
     {
         $rows = [];
         $rows[] = '```';
-        $rows[] = '| ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ';
+        $rows[] = '| ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ | ÐÑÐ¸ÑÐ¸Ð½Ð°';
 
         foreach ($issues as $issue) {
             $rows[] = $this->formatIssueRow($issue);
@@ -799,7 +800,7 @@ class OrderControlReportService
     /**
      * Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÑÐµÑ ÑÑÑÐ¾ÐºÑ ÑÐ°Ð±Ð»Ð¸ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ
      *
-     * Ð¤Ð¾ÑÐ¼Ð°Ñ: | ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ
+     * Ð¤Ð¾ÑÐ¼Ð°Ñ: | ÐÐ°ÑÐ° | ÐÐ½ÑÐµÑÐ²Ð°Ð» | ÐÐ°ÐºÐ°Ð· | Ð ÐÐ | ÐÐ | ÐÑÐ¸ÑÐ¸Ð½Ð°
      *
      * @param OrderIssue $issue
      * @return string
@@ -810,14 +811,16 @@ class OrderControlReportService
         $interval = $this->getShortInterval($issue->interval);
         $rmk = $issue->rmkStatus ?? '-';
         $mp = $this->formatMpStatus($issue);
+        $reason = $issue->getIssueReasonLabel() ?: '-';
 
         return sprintf(
-            '| %s | %s | %s | %s | %s',
+            '| %s | %s | %s | %s | %s | %s',
             $date,
             $interval,
             $issue->orderNumber,
             $rmk,
-            $mp
+            $mp,
+            $reason
         );
     }
 
@@ -844,6 +847,29 @@ class OrderControlReportService
         return $interval;
     }
 
+    /**
+     * Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÑÐµÑ Ð¸Ð½ÑÐµÑÐ²Ð°Ð» Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ ÑÐ¼ÐµÐ½Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð¾ÑÑÑÑÐ°
+     *
+     * 08:00 â "08:00 (Ð´ÐµÐ½Ñ)"
+     * 20:00 â "20:00 (Ð½Ð¾ÑÑ)"
+     *
+     * @param string|null $interval
+     * @return string
+     */
+    private function formatIntervalWithShiftName(?string $interval): string
+    {
+        $shortInterval = $this->getShortInterval($interval);
+
+        if ($shortInterval === '08:00') {
+            return '08:00 (Ð´ÐµÐ½Ñ)';
+        }
+        if ($shortInterval === '20:00') {
+            return '20:00 (Ð½Ð¾ÑÑ)';
+        }
+
+        return $shortInterval;
+    }
+
     /**
      * Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÑÐµÑ ÐÐ-ÑÑÐ°ÑÑÑ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ
      *
@@ -923,7 +949,7 @@ class OrderControlReportService
     </style>
 </head>
 <body>
-    <h2>[ÐÐ¾Ð½ÑÑÐ¾Ð»Ñ MP] ÐÑÑÑÑ Ð·Ð° ' . $this->escapeHtml($result->reportDate) . ' ' . $this->escapeHtml($result->interval) . '</h2>';
+    <h2>[ÐÐ¾Ð½ÑÑÐ¾Ð»Ñ MP] ÐÑÑÑÑ Ð·Ð° ' . $this->escapeHtml($result->reportDate) . ' ' . $this->escapeHtml($this->formatIntervalWithShiftName($result->interval)) . '</h2>';
 
         // ÐÐ±ÑÐ°Ñ ÑÐ°Ð±Ð»Ð¸ÑÐ° ÑÐ¾ Ð²ÑÐµÐ¼Ð¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ð¼Ð¸, ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ð¿Ð¾ ÑÐ¸Ð¿Ñ
         $allIssues = [];
@@ -952,14 +978,16 @@ class OrderControlReportService
             <th>ÐÐ°ÐºÐ°Ð·</th>
             <th>Ð ÐÐ</th>
             <th>ÐÐ</th>
+            <th>ÐÑÐ¸ÑÐ¸Ð½Ð°</th>
         </tr>';
 
         foreach ($allIssues as $item) {
             /** @var OrderIssue $issue */
             $issue = $item['issue'];
             $date = $issue->reportDate ?: date('d.m.Y');
-            $interval = $issue->interval ?: OrderIssue::calculateInterval($this->testMode);
+            $interval = $this->getShortInterval($issue->interval);
             $mpStatus = $issue->mpStatus ?? '-';
+            $reason = $issue->getIssueReasonLabel() ?: '-';
 
             $html .= '
         <tr>
@@ -969,6 +997,7 @@ class OrderControlReportService
             <td>' . $this->escapeHtml($issue->orderNumber) . '</td>
             <td>' . $this->escapeHtml($issue->rmkStatus ?? '-') . '</td>
             <td>' . $this->escapeHtml($mpStatus) . '</td>
+            <td>' . $this->escapeHtml($reason) . '</td>
         </tr>';
         }
 
-- 
2.39.5