RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-20 01:21:01 +00:00
Code Issues Projects Releases Wiki Activity

codestyle fix

Browse source
This commit is contained in:
Sergey Chazov 2020-09-28 10:06:12 +03:00
parent be771679b7
commit 722cb9aafb
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
View file

@ -604,4 +604,14 @@ class RetailcrmConfigProvider
{
return empty($value) && $value !== 0;
}
/**
* Return integration_delivery option
*
* @return mixed
*/
public static function getCrmIntegrationDelivery()
{
return unserialize(COption::GetOptionString(RetailcrmConstants::MODULE_ID, RetailcrmConstants::CRM_INTEGRATION_DELIVERY, 0));
}
}

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

@ -12,13 +12,12 @@ class RetailCrmService
*/
public static function unsetIntegrationDeliveryFields(array $order): array
{
$integrationDelivery = unserialize(COption::GetOptionString(RetailcrmConstants::MODULE_ID, RetailcrmConstants::CRM_INTEGRATION_DELIVERY, 0));
$deliveryCode = $order['delivery']['code'];
if ($deliveryCode) {
if (
!empty($integrationDelivery[$deliveryCode])
$integrationDelivery = RetailcrmConfigProvider::getCrmIntegrationDelivery();
if (isset($order['delivery']['code'])) {
$deliveryCode = $order['delivery']['code'];
if (!empty($integrationDelivery[$deliveryCode])
&& $integrationDelivery[$deliveryCode] !== 'sdek'
&& $integrationDelivery[$deliveryCode] !== 'dpd'
&& $integrationDelivery[$deliveryCode] !== 'newpost'