From 9b685a4a3e02add223abea319e6751def3c1738a Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Thu, 14 Aug 2025 16:25:24 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=B5?= =?utf8?q?=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B5=D1=82=20=D0=B4=D0=B0=D0=BD?= =?utf8?q?=D0=BD=D1=8B=D1=85=20=D0=BE=20=D0=B4=D0=BE=D1=81=D1=82=D0=B0?= =?utf8?q?=D0=B2=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 40a36f21..3635b46f 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -826,6 +826,11 @@ class DataController extends BaseController if ($marketplaceOrder->marketplace_id == 2) { $delivery = array_intersect_key($delivery, array_flip(['address', 'date', 'notes'])); } + if (!empty($delivery)) { + $deliveryString = json_encode($delivery, JSON_UNESCAPED_UNICODE); + } else { + $deliveryString = 'нет данных'; + } $result[] = [ 'id' => $marketplaceOrder->guid, @@ -844,7 +849,7 @@ class DataController extends BaseController 'items' => $itemsFiltered, 'photo_link' => $photoLink, 'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id . - '. Доставка: ' . json_encode($delivery, JSON_UNESCAPED_UNICODE) . + '. Доставка: ' . $deliveryString . ', Товары без артикула: ' . implode(', ', array_map( fn(array $p) => "{$p['product_id']} x{$p['quantity']}", $marketplaceOrder->getProductsWithoutArticule() -- 2.39.5