From d3668c3e37a8a9ddcf6a1f28ac0461894c836803 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 21 Mar 2025 18:06:04 +0300 Subject: [PATCH] [ERP-326] fix --- erp24/actions/infoTable/Test2Action.php | 4 ++-- erp24/jobs/SendTelegramTestMessageJob.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erp24/actions/infoTable/Test2Action.php b/erp24/actions/infoTable/Test2Action.php index 402e8db2..77ca5bfa 100644 --- a/erp24/actions/infoTable/Test2Action.php +++ b/erp24/actions/infoTable/Test2Action.php @@ -29,8 +29,8 @@ class Test2Action extends Action { return Json::encode($r); } catch (\Exception $e) { Yii::error("Ошибка отправки сообщения в Telegram: " . $e->getMessage(), 'telegram'); - $arr = preg_split("/response:/", $e->getMessage()); - return $arr[count($arr) - 1]; + $arr = preg_split("/response:\n/", $e->getMessage()); + return trim($arr[count($arr) - 1], '\n '); } } diff --git a/erp24/jobs/SendTelegramTestMessageJob.php b/erp24/jobs/SendTelegramTestMessageJob.php index 560d1346..a65f54cd 100644 --- a/erp24/jobs/SendTelegramTestMessageJob.php +++ b/erp24/jobs/SendTelegramTestMessageJob.php @@ -53,9 +53,9 @@ class SendTelegramTestMessageJob extends \yii\base\BaseObject implements JobInte } } catch (\Exception $e) { Yii::error("Ошибка отправки сообщения в Telegram: " . $e->getMessage(), 'telegram'); - $arr = preg_split("/response:/", $e->getMessage()); + $arr = preg_split("/response:\n/", $e->getMessage()); + $marketplaceOrders->telegram_error = trim($arr[count($arr) - 1]); $marketplaceOrders->status_telegram = MarketplaceOrders::STATUS_TELEGRAM_ERROR; - $marketplaceOrders->telegram_error = trim($arr[count($arr) - 1], '\n '); $marketplaceOrders->save(); if ($marketplaceOrders->getErrors()) { Yii::error("Ошибка отправки сообщения в Telegram: " . Json::encode($marketplaceOrders->getErrors()), 'site'); -- 2.39.5