From d9f7ba72d87ae6fa21f0057c8a3bb6fa64941e7d Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 22 Aug 2025 16:23:54 +0300
Subject: [PATCH] =?utf8?q?=D0=A2=D0=BE=D0=B2=D0=B0=D1=80=D1=8B=20=D0=B1?=
 =?utf8?q?=D0=B5=D0=B7=20=D0=B0=D1=80=D1=82=D0=B8=D0=BA=D1=83=D0=BB=D0=B0?=
 =?utf8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?=
 =?utf8?q?=D1=80=D0=B8=D1=8F=D1=85=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20?=
 =?utf8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 7fffe9ee..195a8c5f 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -211,6 +211,7 @@ class DataController extends BaseController
                 }
                 $mess['line'][] = __LINE__;
                 $cancelledOrdersArray = $this->getCancelledMarketplaceOrders();
+                $cancelledOrdersArray = $this->getCancelledMarketplaceOrders();
                 if (!empty($cancelledOrdersArray)) {
                     $mess['line'][] = __LINE__;
                     $mess['cancel_orders'] = $cancelledOrdersArray;
@@ -879,6 +880,16 @@ class DataController extends BaseController
                     $deliveryString = 'нет данных';
                 }
 
+                $itemsWithoutSku = array_map(
+                    fn(array $p) => "{$p['product_id']} x{$p['quantity']}",
+                    $marketplaceOrder->getProductsWithoutArticule()
+                );
+                if (!empty($itemsWithoutSku)) {
+                    $itemsWithoutSkuString = ', Товары без артикула: ' . implode(', ',$itemsWithoutSku);
+                } else {
+                    $itemsWithoutSkuString = '';
+                }
+
                 $result[] = [
                     'id' => $marketplaceOrder->guid,
                     'store_id' => $store_id,
@@ -898,10 +909,7 @@ class DataController extends BaseController
                     'photo_link' => $photoLink,
                     'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id .
                         '. Доставка: ' . $deliveryString .
-                        ', Товары без артикула: ' . implode(', ', array_map(
-                            fn(array $p) => "{$p['product_id']} x{$p['quantity']}",
-                            $marketplaceOrder->getProductsWithoutArticule()
-                        ))
+                        $itemsWithoutSkuString
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,
-- 
2.39.5