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

v.2.2.1.1

Browse source
This commit is contained in:
tishevgeniy 2017-09-04 09:36:15 +03:00
parent c28717f385
commit 858b9ea8cd
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,17 @@ class RCrmActions
$bitrixDeliveryTypesList = array();
$arDeliveryServiceAll = \Bitrix\Sale\Delivery\Services\Manager::getActiveList();
$noOrderId = \Bitrix\Sale\Delivery\Services\EmptyDeliveryService::getEmptyDeliveryServiceId();
$groups = array();
foreach ($arDeliveryServiceAll as $arDeliveryService) {
if (($arDeliveryService['PARENT_ID'] == '0' || $arDeliveryService['PARENT_ID'] == null) && $arDeliveryService['ID'] != $noOrderId) {
if ($arDeliveryService['CLASS_NAME'] == '\Bitrix\Sale\Delivery\Services\Group') {
$groups[] = $arDeliveryService['ID'];
}
}
foreach ($arDeliveryServiceAll as $arDeliveryService) {
if ((($arDeliveryService['PARENT_ID'] == '0' || $arDeliveryService['PARENT_ID'] == null) ||
in_array($arDeliveryService['PARENT_ID'], $groups)) &&
$arDeliveryService['ID'] != $noOrderId &&
$arDeliveryService['CLASS_NAME'] != '\Bitrix\Sale\Delivery\Services\Group') {
$bitrixDeliveryTypesList[] = $arDeliveryService;
}
}