From: marina Date: Tue, 1 Jul 2025 12:35:47 +0000 (+0300) Subject: ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c8138749ee1ad6ae2a8e6837e1ed5925ae3a7f80;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 a3b1c54f..ec1af325 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -824,7 +824,7 @@ class DataController extends BaseController ? 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 ?? '') === 1) { + if ($marketplaceOrder->marketplace_id === 2) { foreach (['address', 'date', 'notes'] as $field) { if (!empty($delivery[$field])) { $delivery[$field] = $clean($delivery[$field]);