Правки по телеграм и методы проверки

diff --git a/erp24/records/UsersMessageManagement.php b/erp24/records/UsersMessageManagement.php
index 7115641172be9175c417cf6df45d3195f1a34354..16968530f99dd8d19ac70820893f645130de646c 100644 (file)
--- 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 d000c3b76f5968d17cb5e032ebd7dcbf517f9f58..7b3ab335f7f30ded29c395518660f9497e4354b3 100644 (file)
--- 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 457099cf394d7cb09cba67e3e3a8f1363b8042e3..53d3ac76931eca7be3a3d6fa411ef46209e76caf 100644 (file)
--- 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, [