From e9aa28f4b666c50f97c71f03eae1f3274b8edbd9 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 21 Jan 2025 18:44:46 +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=D1=82=D0=B5=D0=BB=D0=B5=D0=B3=D1=80=D0=B0=D0=BC=20?=
 =?utf8?q?=D0=B8=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=BF=D1=80?=
 =?utf8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/UsersMessageManagement.php |  2 +-
 erp24/records/UsersTelegramMessage.php   |  3 ++-
 erp24/services/TelegramService.php       | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/erp24/records/UsersMessageManagement.php b/erp24/records/UsersMessageManagement.php
index 71156411..16968530 100644
--- a/erp24/records/UsersMessageManagement.php
+++ b/erp24/records/UsersMessageManagement.php
@@ -125,7 +125,7 @@ class UsersMessageManagement extends \yii\db\ActiveRecord
     public function replaceShortcodes($message, $kogortDate)
     {
         $bonusActivity = $this->getBonusAction();
-        $validDate = date('d-m-Y', strtotime("+$bonusActivity days", strtotime($kogortDate)));
+        $validDate = date('d.m.Y', strtotime("+$bonusActivity days", strtotime($kogortDate)));
         $message = str_replace('[NumberOfBonuses]', $this->bonus, $message);
         return str_replace('[ValidityOfBonuses]', $validDate, $message);
     }
diff --git a/erp24/records/UsersTelegramMessage.php b/erp24/records/UsersTelegramMessage.php
index d000c3b7..7b3ab335 100644
--- a/erp24/records/UsersTelegramMessage.php
+++ b/erp24/records/UsersTelegramMessage.php
@@ -39,7 +39,8 @@ class UsersTelegramMessage extends \yii\db\ActiveRecord
             [['kogort_date', 'target_date', 'created_at'], 'safe'],
             [['type'], 'default', 'value' => null],
             [['type'], 'integer'],
-            [['chat_id', 'phone', 'message'], 'string', 'max' => 255],
+            [['message'], 'string'],
+            [['chat_id', 'phone'], 'string', 'max' => 255],
         ];
     }
 
diff --git a/erp24/services/TelegramService.php b/erp24/services/TelegramService.php
index 457099cf..53d3ac76 100644
--- a/erp24/services/TelegramService.php
+++ b/erp24/services/TelegramService.php
@@ -38,6 +38,16 @@ class TelegramService
          return !str_contains($currentUrl, self::TARGET_PROD_URL);
     }
 
+    public static function isDevEnv(): bool
+    {
+        return getenv('DB_HOST') === 'db-yii_erp24';
+    }
+
+    public static function isDevEnvironment(): bool
+    {
+        return getenv('XDEBUG_MODE') === 'debug';
+    }
+
     public static function sendErrorToTelegramMessage($message, $disableNotification, $isDev)
     {
         $botToken = self::TELEGRAM_BOT_DEV;
@@ -75,8 +85,12 @@ class TelegramService
             $botToken = self::TELEGRAM_BOT_PROD;
         }
 
+        $botToken = self::TELEGRAM_BOT_PROD;
+
         $apiURL = "https://api.telegram.org/bot{$botToken}/sendMessage";
 
+        $message = self::escapeMarkdown($message);
+
         $client = new Client();
         try {
             $response = $client->post($apiURL, [
-- 
2.39.5