RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 05:16:09 +03:00
Code Issues Projects Releases Wiki Activity

Исправление передачи местоположения в адресе доставки по истории (#253)

Browse Source 
* Корректировка передачи местоположения в адресе доставки по истории
This commit is contained in:
Vlad 2022-06-14 11:57:44 +03:00 committed by GitHub
parent 134c92199a
commit 60e818e793
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2021-05-18 v.6.0.4
* Исправление передачи местоположения в адресе доставки по истории
## 2021-05-13 v.6.0.3
* Исправление автозагрузки классов

49
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View File

@ -716,45 +716,30 @@ class RetailCrmHistory
}
} elseif (array_key_exists($key, $order['delivery']['address'])) {
if ($propsKey[$orderProp]['TYPE'] == 'LOCATION') {
if( $order['delivery']['address']['index'] ) {
$location = CSaleLocation::GetByZIP($order['delivery']['address']['index']);
}
$order['delivery']['address'][$key] = trim($order['delivery']['address'][$key]);
if(!empty($order['delivery']['address'][$key])){
$parameters = array();
if (!empty($order['delivery']['address'][$key])) {
$parameters['filter']['NAME.LANGUAGE_ID'] = 'ru';
$parameters['limit'] = 1;
$parameters['select'] = array('*');
// if address have a dot
$loc = explode('.', $order['delivery']['address'][$key]);
if (count($loc) == 1) {
$parameters['filter']['PHRASE'] = RCrmActions::fromJSON(trim($loc[0]));
} elseif (count($loc) == 2) {
$parameters['filter']['PHRASE'] = RCrmActions::fromJSON(trim($loc[1]));
$parameters['filter']['=NAME.NAME'] = RCrmActions::fromJSON(trim($loc[0]));
} else {
RCrmActions::eventLog(
'RetailCrmHistory::orderHistory',
'RetailCrmHistory::setProp',
sprintf(
'Error location. %s not found add in order number = %s',
$order['delivery']['address'][$key],
$order['number']
)
);
continue;
$parameters['filter']['=NAME.NAME'] = RCrmActions::fromJSON(trim($loc[1]));
}
$parameters['filter']['NAME.LANGUAGE_ID'] = 'ru';
$location = Finder::find(
$parameters
)->fetch();
}
if (!empty($location)) {
$somePropValue = $propertyCollection
->getItemByOrderPropertyId($propsKey[$orderProp]['ID'])
;
try {
if (!isset($location)) {
$location = Finder::find(
$parameters,
['USE_INDEX' => false, 'USE_ORM' => false]
)->fetch();
}
$somePropValue = $propertyCollection
->getItemByOrderPropertyId($propsKey[$orderProp]['ID']);
self::setProp($somePropValue, $location['CODE']);
} catch (ArgumentException $argumentException) {
RCrmActions::eventLog(
@ -773,8 +758,6 @@ class RetailCrmHistory
$order['number']
)
);
continue;
}
} else {
$somePropValue = $propertyCollection

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Исправление автозагрузки классов
- Исправление передачи местоположения в адресе доставки по истории

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php
$arModuleVersion = [
'VERSION' => '6.0.3',
'VERSION_DATE' => '2022-05-13 14:00:00'
'VERSION' => '6.0.4',
'VERSION_DATE' => '2022-05-18 17:00:00'
];