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

v.2.0.5

Browse Source
This commit is contained in:
Евгений Тыщицкий 2016-10-12 11:40:18 +03:00
parent 3f858702c4
commit 0b4c15d819
5 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## 2016-10-11 v.2.0.5
* Исправлена ошибка при обработке Ф.И.О.
* Исправлена ошибка с неверной кодировкой свойств
* Исправлена ошибка формирования списка статусов
## 2016-10-06 v.2.0.4 ## 2016-10-06 v.2.0.4
* Оптимизация History * Оптимизация History
* Исправлена ошибка выгрузки доставок при установке * Исправлена ошибка выгрузки доставок при установке

12
intaro.retailcrm/classes/general/RCrmActions.php
View File

@ -67,9 +67,15 @@ class RCrmActions
public static function StatusesList() public static function StatusesList()
{ {
$bitrixPaymentStatusesList = array(); $bitrixPaymentStatusesList = array();
$arStatusesAll = \Bitrix\Sale\OrderStatus::getAllStatusesNames(); $obStatuses = \Bitrix\Sale\Internals\StatusTable::getList(array(
foreach ($arStatusesAll as $key => $arStatus) { 'filter' => array('TYPE' => 'O'),
$bitrixPaymentStatusesList[$key] = array('ID' => $key, 'NAME' => $arStatus); 'select' => array('ID', "NAME" => 'Bitrix\Sale\Internals\StatusLangTable:STATUS.NAME')
));
while ($arStatus = $obStatuses->fetch()) {
$bitrixPaymentStatusesList[$arStatus['ID']] = array(
'ID' => $arStatus['ID'],
'NAME' => $arStatus['NAME'],
);
} }
return $bitrixPaymentStatusesList; return $bitrixPaymentStatusesList;

50
intaro.retailcrm/classes/general/history/RetailCrmHistory.php
View File

@ -477,7 +477,7 @@ class RetailCrmHistory
} }
if (array_key_exists('statusComment', $order)) { if (array_key_exists('statusComment', $order)) {
self::setProp($newOrder, $order['statusComment'], 'REASON_CANCELED'); self::setProp($newOrder, RCrmActions::fromJSON($order['statusComment']), 'REASON_CANCELED');
} }
$propertyCollection = $newOrder->getPropertyCollection(); $propertyCollection = $newOrder->getPropertyCollection();
@ -520,53 +520,41 @@ class RetailCrmHistory
$fio = ''; $fio = '';
foreach ($propertyCollectionArr['properties'] as $prop) { foreach ($propertyCollectionArr['properties'] as $prop) {
if (in_array($optionsOrderProps[$personType]['fio'], $prop)) { if (in_array($optionsOrderProps[$personType]['fio'], $prop)) {
$fio = $newOrder->getPropertyCollection()->getItemByOrderPropertyId($prop['ID']); $fio = $newOrder->getPropertyCollection()->getItemByOrderPropertyId($prop['ID'])->getValue();
} }
} }
$fio = RCrmActions::explodeFIO($fio); $fio = RCrmActions::explodeFIO($fio);
$newFio = array();
if ($fio) { if ($fio) {
$order['fio'] = trim( $newFio[] = isset($order['lastName']) ? RCrmActions::fromJSON($order['lastName']) : (isset($fio['lastName']) ? $fio['lastName'] : '');
implode( $newFio[] = isset($order['firstName']) ? RCrmActions::fromJSON($order['firstName']) : (isset($fio['firstName']) ? $fio['firstName'] : '');
' ', $newFio[] = isset($order['patronymic']) ? RCrmActions::fromJSON($order['patronymic']) : (isset($fio['patronymic']) ? $fio['patronymic'] : '');
array( $order['fio'] = trim(implode(' ', $newFio));
isset($order['lastName']) ? $order['lastName'] : (isset($fio['lastName']) ? $fio['lastName'] : ''),
isset($order['firstName']) ? $order['firstName'] : (isset($fio['firstName']) ? $fio['firstName'] : ''),
isset($order['patronymic']) ? $order['patronymic'] : (isset($fio['patronymic']) ? $fio['patronymic'] : ''),
)
)
);
} else { } else {
$order['fio'] = trim( $newFio[] = isset($order['lastName']) ? RCrmActions::fromJSON($order['lastName']) : '';
implode( $newFio[] = isset($order['firstName']) ? RCrmActions::fromJSON($order['firstName']) : '';
' ', $newFio[] = isset($order['patronymic']) ? RCrmActions::fromJSON($order['patronymic']) : '';
array( $order['fio'] = trim(implode(' ', $newFio));
isset($order['lastName']) ? $order['lastName'] : '',
isset($order['firstName']) ? $order['firstName'] : '',
isset($order['patronymic']) ? $order['patronymic'] : '',
)
)
);
} }
} }
//optionsOrderProps //optionsOrderProps
if ($optionsOrderProps[$personType]) { if ($optionsOrderProps[$personType]) {
foreach ($optionsOrderProps[$personType] as $key => $orderProp) { foreach ($optionsOrderProps[$personType] as $key => $orderProp) {
if (array_key_exists($key, $order)) { if (array_key_exists($key, $order)) {
$somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']); $somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']);
self::setProp($somePropValue, $order[$key]); self::setProp($somePropValue, RCrmActions::fromJSON($order[$key]));
} elseif (array_key_exists($key, $order['delivery']['address'])) { } elseif (array_key_exists($key, $order['delivery']['address'])) {
if ($propsKey[$key]['TYPE'] == 'LOCATION') { if ($propsKey[$key]['TYPE'] == 'LOCATION') {
$parameters['filter']['NAME'] = $order['delivery']['address'][$key]; $parameters['filter']['NAME'] = RCrmActions::fromJSON($order['delivery']['address'][$key]);
$parameters['filter']['LANGUAGE_ID'] = 'ru'; $parameters['filter']['LANGUAGE_ID'] = 'ru';
$location = \Bitrix\Sale\Location\LocationTable::getListFast($parameters)->fetch(); $location = \Bitrix\Sale\Location\LocationTable::getListFast($parameters)->fetch();
$somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']); $somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']);
self::setProp($somePropValue, $location['CODE']); self::setProp($somePropValue, $location['CODE']);
} else { } else {
$somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']); $somePropValue = $propertyCollection->getItemByOrderPropertyId($propsKey[$orderProp]['ID']);
self::setProp($somePropValue, $order['delivery']['address'][$key]); self::setProp($somePropValue, RCrmActions::fromJSON($order['delivery']['address'][$key]));
} }
} }
} }
@ -590,10 +578,10 @@ class RetailCrmHistory
} }
//comments //comments
if (array_key_exists('customerComment', $order)) { if (array_key_exists('customerComment', $order)) {
self::setProp($newOrder, $order['customerComment'], 'USER_DESCRIPTION'); self::setProp($newOrder, RCrmActions::fromJSON($order['customerComment']), 'USER_DESCRIPTION');
} }
if (array_key_exists('managerComment', $order)) { if (array_key_exists('managerComment', $order)) {
self::setProp($newOrder, $order['managerComment'], 'COMMENTS'); self::setProp($newOrder, RCrmActions::fromJSON($order['managerComment']), 'COMMENTS');
} }
//items //items
@ -608,12 +596,12 @@ class RetailCrmHistory
} }
$item = $basket->createItem('catalog', $product['offer']['externalId']); $item = $basket->createItem('catalog', $product['offer']['externalId']);
if ($item instanceof \Bitrix\Sale\Basket) { if ($item instanceof \Bitrix\Sale\Basket) {
$elem = self::getInfoElement(); $elem = self::getInfoElement($product['offer']['externalId']);
$item->setFields(array( $item->setFields(array(
'CURRENCY' => \Bitrix\Currency\CurrencyManager::getBaseCurrency(), 'CURRENCY' => \Bitrix\Currency\CurrencyManager::getBaseCurrency(),
'LID' => \Bitrix\Main\Context::getCurrent()->getSite(), 'LID' => \Bitrix\Main\Context::getCurrent()->getSite(),
'BASE_PRICE' => $product['initialPrice'], 'BASE_PRICE' => $product['initialPrice'],
'NAME' => $elem['NAME'], 'NAME' => $product['name'] ? RCrmActions::fromJSON($product['name']) : $elem['NAME'],
'DETAIL_PAGE_URL' => $elem['URL'] 'DETAIL_PAGE_URL' => $elem['URL']
)); ));
} else { } else {
@ -1129,7 +1117,7 @@ class RetailCrmHistory
public static function newValue($value) public static function newValue($value)
{ {
if (isset($value['code'])) { if (array_key_exists('code', $value)) {
return $value['code']; return $value['code'];
} else { } else {
return $value; return $value;

2
intaro.retailcrm/classes/general/order/RetailCrmOrder.php
View File

@ -128,7 +128,7 @@ class RetailCrmOrder
//отправка //отправка
if (function_exists('retailCrmBeforeOrderSend')) { if (function_exists('retailCrmBeforeOrderSend')) {
$newResOrder = retailCrmBeforeOrderSend($order); $newResOrder = retailCrmBeforeOrderSend($order, $arFields);
if (is_array($newResOrder) && !empty($newResOrder)) { if (is_array($newResOrder) && !empty($newResOrder)) {
$order = $newResOrder; $order = $newResOrder;
} }

5
intaro.retailcrm/description.ru
View File

@ -1,2 +1,3 @@
- Оптимизация History - Исправлена ошибка в истории при обработке Ф.И.О.
- Исправлена ошибка выгрузки доставок при установке - Исправлена ошибка с неверной кодировкой свойств
- Исправлена ошибка формирования списка статусов