From 0c06362e7424527549ebe5eeb965f15acc1a2a79 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 1 Jul 2025 12:06:48 +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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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, -- 2.39.5