From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Fri, 11 Jul 2025 12:18:12 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-409_create_check_for_success_marketpl... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=e1f7e72835838efbbea0a761b3a6abf8a8186a01;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-409_create_check_for_success_marketplace_order

# Conflicts:
#	erp24/actions/infoTable/TestAction.php
---

e1f7e72835838efbbea0a761b3a6abf8a8186a01
diff --cc erp24/services/MarketplaceService.php
index 4931db5a,f7dcfb7d..a3a4b788
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@@ -991,10 -989,9 +991,10 @@@ class MarketplaceServic
                      $substatusId = $statuses[$substatusCode];
                  }
  
-                 $newRawData = json_encode($order);
+                 $newRawData = json_encode($order, JSON_UNESCAPED_UNICODE);
                  $marketplaceOrder = MarketplaceOrders::find()
                      ->where(['marketplace_order_id' => (string)$order->getId()])
 +                    ->with(['status', 'substatus'])
                      ->one();
  
                  if (!$marketplaceOrder) {