]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Merge branch 'develop' into feature_zozirova_erp-433_fix_view_and_add_new_report
authorAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Thu, 3 Jul 2025 11:45:44 +0000 (14:45 +0300)
committerAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Thu, 3 Jul 2025 11:45:44 +0000 (14:45 +0300)
1  2 
erp24/services/MarketplaceService.php

index 37a26fb2803784853e20189df0886ed549f823c4,f7dcfb7ddbe0d7759707311e3040bef5979f7b66..3cefeedbdcebc28f1df8a6a65cd19409c28d6a68
@@@ -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) {