From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 28 Feb 2025 13:43:42 +0000 (+0300)
Subject: Исправление caption сообщений в телеграм
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=db4b5ec7f2b9f97521ec310460be75686dc44d1a;p=erp24_rep%2Fyii-erp24%2F.git

Исправление caption сообщений в телеграм
---

diff --git a/erp24/actions/log/CollectAction.php b/erp24/actions/log/CollectAction.php
index 0b15971a..02393f02 100755
--- a/erp24/actions/log/CollectAction.php
+++ b/erp24/actions/log/CollectAction.php
@@ -45,7 +45,7 @@ class CollectAction extends Action
             }
 
             if ($createdAt = date('Y-m-d H:i:s', $log->log_time)) {
-                $errorMessage .= "*Created At:*\n```" . TelegramService::escapeMarkdownLog($createdAt) . "```\n\n";
+                $errorMessage .= "*Created At:*\n```" . "\n" . TelegramService::escapeMarkdownLog($createdAt) . "```\n\n";
             }
 
             if ($ip = $log->ip) {
@@ -53,27 +53,27 @@ class CollectAction extends Action
             }
 
             if ($userAgent = $log->user_agent) {
-                $errorMessage .= "*User Agent:*\n```" . TelegramService::escapeMarkdownLog($userAgent) . "```\n\n";
+                $errorMessage .= "*User Agent:*\n```" . "\n" . TelegramService::escapeMarkdownLog($userAgent) . "```\n\n";
             }
 
             if ($file = $log->file) {
-                $errorMessage .= "*File:*\n```" . TelegramService::escapeMarkdownLog($file) . "```\n\n";
+                $errorMessage .= "*File:*\n```" .  "\n" . TelegramService::escapeMarkdownLog($file) . "```\n\n";
             }
 
             if ($line = $log->line) {
-                $errorMessage .= "*Line:*\n```" . TelegramService::escapeMarkdownLog($line) . "```\n\n";
+                $errorMessage .= "*Line:*\n```" . "\n" . TelegramService::escapeMarkdownLog($line) . "```\n\n";
             }
 
             if ($col = $log->col) {
-                $errorMessage .= "*Column:*\n```" . TelegramService::escapeMarkdownLog($col) . "```\n\n";
+                $errorMessage .= "*Column:*\n```" . "\n" . TelegramService::escapeMarkdownLog($col) . "```\n\n";
             }
 
             if ($message = $log->message) {
-                $errorMessage .= "*Message:*\n```" . TelegramService::escapeMarkdownLog($message) . "```\n\n";
+                $errorMessage .= "*Message:*\n```" . "\n" . TelegramService::escapeMarkdownLog($message) . "```\n\n";
             }
 
             if ($context = $log->context) {
-                $errorMessage .= "*Context:*\n```" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
+                $errorMessage .= "*Context:*\n```" . "\n" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
             }
 
             $disableNotification = false;
diff --git a/erp24/services/InfoLogService.php b/erp24/services/InfoLogService.php
index 17db366d..0b688d45 100644
--- a/erp24/services/InfoLogService.php
+++ b/erp24/services/InfoLogService.php
@@ -48,7 +48,7 @@ class InfoLogService
             }
 
             if ($context) {
-                $telegramMessage .= "*Context:*\n```log" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
+                $telegramMessage .= "*Context:*\n```log\n" . TelegramService::escapeMarkdownLog($context) . "```\n\n";
             }
 
             $isDev = TelegramService::isDevEnv();
diff --git a/erp24/services/LogService.php b/erp24/services/LogService.php
index 02af15dc..1e1d8d0d 100644
--- a/erp24/services/LogService.php
+++ b/erp24/services/LogService.php
@@ -75,7 +75,7 @@ class LogService
             }
 
             if ($createdAt = $apiErrorLog->created_at) {
-                $errorMessage .= "*Created At:*\n```" . $createdAt . "```\n\n";
+                $errorMessage .= "*Created At:*\n```" . "\n" . $createdAt . "```\n\n";
             }
 
             if ($ip = $apiErrorLog->ip) {