Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2026-04-01 v6.7.10
- Исправлена ошибка переноса данных между клиентами при синхронизации истории

## 2026-03-16 v6.7.9
- Добавлена дополнительная проверка на наличие подписки у пользователя

Expand Down
11 changes: 5 additions & 6 deletions intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ public static function customerHistory()
RetailcrmConfigProvider::setCustomersHistorySinceId($lastId['id']);

$newUser = new CUser();
$customerBuilder = new CustomerBuilder();

foreach ($customers as $customer) {
$customerBuilder = new CustomerBuilder();

if (function_exists('retailCrmBeforeCustomerSave')) {
$newResCustomer = retailCrmBeforeCustomerSave($customer);
if (is_array($newResCustomer) && !empty($newResCustomer)) {
Expand All @@ -144,11 +145,9 @@ public static function customerHistory()
continue;
}

if (RetailcrmConfigProvider::isPhoneRequired()) {
if (isset($customer['create']) && empty($customer['phones'])) {
Logger::getInstance()->write('$customer["phones"] is empty. Customer ' . $customer['id'] . ' cannot be created', 'createCustomerError');
continue;
}
if (RetailcrmConfigProvider::isPhoneRequired() && !isset($customer['externalId']) && (!isset($customer['phones']) || count($customer['phones']) === 0)) {
Logger::getInstance()->write('$customer["phones"] is empty. Customer ' . $customer['id'] . ' cannot be created', 'createCustomerError');
continue;
}

if (isset($customer['externalId']) && !is_numeric($customer['externalId'])) {
Expand Down
4 changes: 2 additions & 2 deletions intaro.retailcrm/install/version.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

$arModuleVersion = [
'VERSION' => '6.7.9',
'VERSION_DATE' => '2026-03-16 17:30:00'
'VERSION' => '6.7.10',
'VERSION_DATE' => '2026-04-01 17:30:00'
];
2 changes: 1 addition & 1 deletion intaro.retailcrm/lib/component/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
class Constants
{
public const MODULE_VERSION = '6.7.9';
public const MODULE_VERSION = '6.7.10';
public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
public const CRM_USERS_MAP = 'crm_users_map';
Expand Down
Loading