From d7dc75fde36aa96fe9da29a4e6516c0565a33b22 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 1 Jul 2025 15:08:15 +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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index edbd5620..22792da8 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -819,12 +819,11 @@ 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])) {
@@ -833,10 +832,6 @@ class DataController extends BaseController
                     }
                 }
 
-                $products = implode(', ', array_map(
-                    fn(array $p) => "{$p['product_id']} x{$p['quantity']}",
-                    $marketplaceOrder->getProductsWithoutArticule()
-                ));
                 $result[] = [
                     'id' => $marketplaceOrder->guid,
                     'store_id' => $store_id,
@@ -854,7 +849,12 @@ class DataController extends BaseController
                     'delivery_type' => $delivery_type,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
-                    'comment' => json_encode('Доставка: ' . $delivery . ', Товары без артикула: ' . $products, JSON_UNESCAPED_UNICODE),
+                    'comment' => 'Доставка: ' . json_encode($delivery, JSON_UNESCAPED_UNICODE) .
+                        ', Товары без артикула: ' . implode(', ', array_map(
+                            fn(array $p) => "{$p['product_id']} x{$p['quantity']}",
+                            $marketplaceOrder->getProductsWithoutArticule()
+                        ))
+
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,
-- 
2.39.5