RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-04 14:23:33 +03:00
Code Issues Projects Releases Wiki Activity

Fix tests

Browse source
This commit is contained in:
Uryvskiy Dima 2023-10-10 22:35:06 +03:00
parent a7a338a189
commit 3d9fd4d31f
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
intaro.retailcrm/classes/general/RCrmActions.php
View file

@ -321,6 +321,7 @@ class RCrmActions
/** @var \Intaro\RetailCrm\Service\Utils $utils */
$utils = ServiceLocator::getOrCreate(\Intaro\RetailCrm\Service\Utils::class);
return $utils->fromUTF8($str);
}

5
intaro.retailcrm/classes/general/services/RetailCrmService.php
View file

@ -187,8 +187,9 @@ class RetailCrmService
$countryList = [];
if (file_exists($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml')) {
$countrysFile = simplexml_load_file($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml');
foreach ($countrysFile->country as $country) {
$countryFile = simplexml_load_file($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml');
foreach ($countryFile->country as $country) {
$countryList[RCrmActions::fromJSON((string) $country->name)] = (string) $country->alpha;
}
}

1
tests/classes/general/order/RetailCrmOrder_v5Test.php
View file

@ -154,6 +154,7 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
$rcrmActions = Mockery::mock('alias:' . RCrmActions::class);
$rcrmActions->shouldReceive('apiMethod')->withAnyArgs()->andReturn(true);
$rcrmActions->shouldReceive('fromJSON')->withAnyArgs()->andReturn('');
$result = RetailCrmOrder::uploadOrders();