From: marina <m.zozirova@gmail.com>
Date: Tue, 1 Jul 2025 12:05:18 +0000 (+0300)
Subject: ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=cb65cf72f6029b8645a964c2cd871162eebe8049;p=erp24_rep%2Fyii-erp24%2F.git

ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 636fd023..edbd5620 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -833,6 +833,10 @@ 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,
@@ -850,9 +854,7 @@ class DataController extends BaseController
                     'delivery_type' => $delivery_type,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
-                    'comment_data' => json_encode([
-                        'comment' => 'Доставка: ' . $delivery . ', Товары без артикула: ' . implode(', ', $marketplaceOrder->getProductsWithoutArticule())
-                    ], JSON_UNESCAPED_UNICODE)
+                    'comment' => json_encode('Доставка: ' . $delivery . ', Товары без артикула: ' . $products, JSON_UNESCAPED_UNICODE),
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,