From: marina <m.zozirova@gmail.com>
Date: Tue, 1 Jul 2025 09:06:48 +0000 (+0300)
Subject: ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0c06362e7424527549ebe5eeb965f15acc1a2a79;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 479e95a6..a748d65a 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -841,10 +841,12 @@ class DataController extends BaseController
                     'delivery_type' => $delivery_type,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
-                    'comment_data' => json_encode([
-                        'delivery' => $rawData['delivery'] ?? null,
-                        'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule(),
-                    ])
+                    'comment_data' =>
+                        json_encode([
+                            'delivery' => (is_string($marketplaceOrder->raw_data) ?
+                            json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? null :
+                            $marketplaceOrder->raw_data['delivery'] ?? null),
+                            'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule()])
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,