From 920efe9ee66a21062d3d9b1b62718bee05c08168 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 1 Jul 2025 15:54:16 +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 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index ec1af325..40a36f21 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -823,13 +823,8 @@ class DataController extends BaseController $delivery = is_string($marketplaceOrder->raw_data) ? json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? [] : $marketplaceOrder->raw_data['delivery'] ?? []; - $clean = fn($v) => trim(preg_replace('/\s+/', ' ', is_array($v) ? implode(' ', $v) : str_replace(["\r", "\n"], ' ', $v))); - if ($marketplaceOrder->marketplace_id === 2) { - foreach (['address', 'date', 'notes'] as $field) { - if (!empty($delivery[$field])) { - $delivery[$field] = $clean($delivery[$field]); - } - } + if ($marketplaceOrder->marketplace_id == 2) { + $delivery = array_intersect_key($delivery, array_flip(['address', 'date', 'notes'])); } $result[] = [ -- 2.39.5