Убрал двойное кодирование и ошибку сохранения заказов из писем

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 68d46d797e57b1943e257f1a3845f2f54ce81563..e3197182e0347f74a7e0069afe7cb6b3cd1ef065 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1733,7 +1733,7 @@ class MarketplaceService
             $email->from = $from;
             $email->to = $to;
             $email->date = $date;
-            $email->body = $body;
+            $email->body = quoted_printable_decode($body);
             $email->created_at = date('Y-m-d H:i:s');
 
             if ($email->save()) {
@@ -1851,7 +1851,6 @@ class MarketplaceService
         $orderDetails = null;
         $order = null;
         if (!empty($html)) {
-            $html = quoted_printable_decode($html);
             $html = preg_replace('/\s+/', ' ', $html);
             // Декодируем HTML-сущности
             $html = html_entity_decode($html, ENT_COMPAT, 'UTF-8');
@@ -1862,11 +1861,11 @@ class MarketplaceService
 
             if ($main !== false) {
                 $orderTitleNode = $main->findOne("h1");
-
                 if ($orderTitleNode && preg_match('/№(\d+)/', $orderTitleNode->innertext, $matches)) {
                     $orderNumber = (int)$matches[1];
                 }
             }
+
             $orderDetails['number'] = $orderNumber;
             $orderDetails['date'] = $message['date'];
             $deliveryText = '';
@@ -2044,7 +2043,6 @@ class MarketplaceService
         $statusCodes = array_unique(array_keys($statuses));
         $newOrdersCount = 0;
         $campaignId = $store;
-
         $orderNumber = key($order);
         $orderDetails = reset($order);
 
@@ -2056,7 +2054,6 @@ class MarketplaceService
             ->one();
 
         if (!$marketplaceOrder) {
-
             if ($index == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
                 $marketplaceOrder = self::createOrder($orderDetails, $campaignId, $statusId, $substatusId);
                 if ($marketplaceOrder->save()) {