From 23dd72249468cf1e821c13a59d8885c010349b25 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 19 Feb 2026 10:54:39 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?utf8?q?=D0=B2=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../MarketplaceFlowwowEmailsController.php     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/erp24/controllers/MarketplaceFlowwowEmailsController.php b/erp24/controllers/MarketplaceFlowwowEmailsController.php
index 2f940349..167dc146 100644
--- a/erp24/controllers/MarketplaceFlowwowEmailsController.php
+++ b/erp24/controllers/MarketplaceFlowwowEmailsController.php
@@ -9,7 +9,6 @@ use yii_app\records\MarketplaceFlowwowEmailsSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii_app\services\MarketplaceService;
 
 /**
  * MarketplaceFlowwowEmailsController implements the CRUD actions for MarketplaceFlowwowEmails model.
@@ -88,20 +87,11 @@ class MarketplaceFlowwowEmailsController extends Controller
                 $orderNumber = $matches[1];
             }
 
-            // Fallback: парсим h1 из тела письма (для: "Новый оплаченный заказ", "Доставлен")
+            // Fallback: ищем №XXXXX в теле письма (для: "Новый оплаченный заказ", "Доставлен")
             if (empty($orderNumber) && !empty($email->body)) {
-                $message = [
-                    'subject'       => $email->subject,
-                    'subject_index' => $email->subject_type,
-                    'from'          => $email->from,
-                    'to'            => $email->to,
-                    'date'          => $email->date,
-                    'body'          => $email->body,
-                ];
-                $orderData = MarketplaceService::getOrdersDataFromMessage($message);
-                $key = !empty($orderData) ? key($orderData) : null;
-                if (!empty($key)) {
-                    $orderNumber = (string)$key;
+                $body = html_entity_decode($email->body, ENT_COMPAT, 'UTF-8');
+                if (preg_match('/№(\d+)/', $body, $matches)) {
+                    $orderNumber = $matches[1];
                 }
             }
 
-- 
2.39.5