From 968e74b82966ad9c8efff2b0736eaf5905decf32 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 1 Jul 2025 12:59:29 +0300
Subject: [PATCH] =?utf8?q?ERP-427=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?utf8?q?=D1=82=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?=
 =?utf8?q?=D0=B0=D1=80=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82?=
 =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?utf8?q?=D0=B7=D0=B0=20=D0=B8=D0=B7=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B5?=
 =?utf8?q?=D1=82=D0=BF=D0=BB=D0=B5=D0=B9=D1=81=20=D1=81=201=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 0bc5f553..636fd023 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -761,10 +761,6 @@ class DataController extends BaseController
                 'cancel_requested' => $marketplaceOrder->cancel_requested,
                 'raw_data' => $marketplaceOrder->raw_data,
                 'link' => $marketplaceOrder->order_link,
-                'comment' => json_encode([
-                    'delivery' => $marketplaceOrder->raw_data['delivery'],
-                    'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule(),
-                ])
             ];
         }
         return $result;
@@ -823,6 +819,19 @@ class DataController extends BaseController
                     $baseUrl = 'https://media.erp-flowers.ru';
                 }
                 $photoLink = $baseUrl . '/marketplace/upload?guid=' . $marketplaceOrder->guid;
+                $delivery = is_string($marketplaceOrder->raw_data)
+                    ? json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? []
+                    : $marketplaceOrder->raw_data['delivery'] ?? [];
+
+                $clean = fn($v) => trim(preg_replace('/\s+/', ' ', is_array($v) ? implode(' ', $v) : str_replace(["\r", "\n"], ' ', $v)));
+
+                if (($marketplaceOrder->marketplace_id ?? '') === 1) {
+                    foreach (['address', 'date', 'notes'] as $field) {
+                        if (!empty($delivery[$field])) {
+                            $delivery[$field] = $clean($delivery[$field]);
+                        }
+                    }
+                }
 
                 $result[] = [
                     'id' => $marketplaceOrder->guid,
@@ -842,11 +851,8 @@ class DataController extends BaseController
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
                     'comment_data' => json_encode([
-                        'delivery' => (is_string($marketplaceOrder->raw_data)
-                            ? json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? null
-                            : $marketplaceOrder->raw_data['delivery'] ?? null),
-                        'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule()
-                    ], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)
+                        'comment' => 'Доставка: ' . $delivery . ', Товары без артикула: ' . implode(', ', $marketplaceOrder->getProductsWithoutArticule())
+                    ], JSON_UNESCAPED_UNICODE)
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,
-- 
2.39.5