Merge branch 'develop' into feature_smirnov_erp-409_create_check_for_success_marketpl...

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

diff --cc erp24/api2/controllers/DataController.php
Simple merge

diff --cc erp24/records/MarketplaceOrders.php
Simple merge

diff --cc erp24/services/MarketplaceService.php
index 4931db5a73364f3da8f9803ff29d2c83bd4ce2ba,f7dcfb7ddbe0d7759707311e3040bef5979f7b66..a3a4b788c2e7d98e9ca96300041e8ea8dd2f1cf4
--- 1/erp24/services/MarketplaceService.php
--- 2/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) {

diff --cc erp24/views/marketplace-orders/view.php
Simple merge