From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Thu, 3 Jul 2025 11:45:44 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-433_fix_view_and_add_new_report
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1aa51c7dcfa7a698610e10e89af5660bed715e4d;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-433_fix_view_and_add_new_report
---

1aa51c7dcfa7a698610e10e89af5660bed715e4d
diff --cc erp24/services/MarketplaceService.php
index 37a26fb2,f7dcfb7d..3cefeedb
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@@ -1469,9 -1436,9 +1469,9 @@@ class MarketplaceServic
              list($returnResponse) = $returnsApi->getReturnWithHttpInfo($campaignId, $orderId, $returnId, $contentType);
              $returnResult = $returnResponse->getResult();
              $returnedAt = $returnResult->getCreationDate();
-             $rawReturnData = json_encode($returnResponse);
+             $rawReturnData = json_encode($returnResponse , JSON_UNESCAPED_UNICODE);
              return [
 -                'returnedAt'    => $returnedAt,
 +                'returnedAt' => $returnedAt,
                  'rawReturnData' => $rawReturnData,
              ];
          } catch (\Exception $e) {