From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 22 Aug 2025 06:39:38 +0000 (+0300)
Subject: Комментарий
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=49c2cbf0526e5954ec74cc98790eb58ff73a3e8c;p=erp24_rep%2Fyii-erp24%2F.git

Комментарий
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 2608cb69..bce78080 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -867,10 +867,21 @@ class DataController extends BaseController
                 }
                 $photoLink = $baseUrl . '/marketplace/upload?guid=' . $marketplaceOrder->guid;
 
+                $delivery = is_string($marketplaceOrder->raw_data)
+                    ? json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? []
+                    : $marketplaceOrder->raw_data['delivery'] ?? [];
+                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,
                     'store_id' => $store_id,
-                    'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id,
                     'summ' => $summ,
                     'seller_id' => '',
                     'status' => 0,
@@ -885,10 +896,12 @@ class DataController extends BaseController
                     'delivery_address' => $deliveryAddress,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
-                    'comment_data' => json_encode([
-                        'delivery' => $rawData['delivery'] ?? null,
-                        'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule(),
-                    ])
+                    'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id .
+                        '. Доставка: ' . $deliveryString .
+                        ', Товары без артикула: ' . 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,