[ERP-326] fix

diff --git a/erp24/actions/infoTable/Test2Action.php b/erp24/actions/infoTable/Test2Action.php
index 402e8db214dc569f6e2378806e6754220df2eed7..77ca5bfaac83521d82c529d95594542d0b3d0db0 100644 (file)
--- 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 560d13462588b1accd351708fb0bcbf607b1800d..a65f54cd244a42330098edd92f9b46a87d9462f1 100644 (file)
--- 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');