From cb65cf72f6029b8645a964c2cd871162eebe8049 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 1 Jul 2025 15:05:18 +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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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, -- 2.39.5