From: marina Date: Tue, 1 Jul 2025 12:54:16 +0000 (+0300) Subject: ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=920efe9ee66a21062d3d9b1b62718bee05c08168;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 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[] = [