Падение в таймаут

diff --git a/erp24/controllers/MarketplaceFlowwowEmailsController.php b/erp24/controllers/MarketplaceFlowwowEmailsController.php
index 2f940349736b39b812b1dc1c1441718bc1cdd859..167dc1462a8288b64e8d634b1d00745d3d10727b 100644 (file)
--- 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: паÑ\80Ñ\81им h1 из Ñ\82ела письма (для: "Новый оплаченный заказ", "Доставлен")
+            // Fallback: иÑ\89ем â\84\96XXXXX в Ñ\82еле письма (для: "Новый оплаченный заказ", "Доставлен")
             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];
                 }
             }