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

ref #91040 исправлена передача подписки по истории

Browse source
This commit is contained in:
Ivan Chaplygin 2023-07-17 11:50:45 +03:00
parent ec91b57cbf
commit 21da16874e
5 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
intaro.retailcrm/classes/general/CustomerBuilder.php
View file

@ -200,6 +200,15 @@ class CustomerBuilder extends AbstractBuilder implements RetailcrmBuilderInterfa
if (isset($this->dataCrm['address'])) {
$this->buildAddress();
}
// клиент подписан при значении равном null
if (array_key_exists('subscribed', $this->dataCrm)) {
if (empty($this->dataCrm['subscribed'])) {
$this->customer->setSubscribe('Y');
} else {
$this->customer->setSubscribe('N');
}
}
}
public function buildPassword()

14
intaro.retailcrm/classes/general/Model/Customer.php
View file

@ -47,6 +47,9 @@ class Customer extends BaseModel
/**@var string $PERSONAL_GENDER */
protected $PERSONAL_GENDER;
/**@var string $UF_SUBSCRIBE_USER_EMAIL */
protected $UF_SUBSCRIBE_USER_EMAIL;
/**
* @param string $EMAIL
* @return $this
@ -200,4 +203,15 @@ class Customer extends BaseModel
return $this;
}
/**
* @param string $UF_SUBSCRIBE_USER_EMAIL
* @return $this
*/
public function setSubscribe($UF_SUBSCRIBE_USER_EMAIL)
{
$this->UF_SUBSCRIBE_USER_EMAIL = $UF_SUBSCRIBE_USER_EMAIL;
return $this;
}
}

1
intaro.retailcrm/classes/general/config/objects.xml
View file

@ -15,6 +15,7 @@
<field id="cumulative_discount" group="customer">cumulativeDiscount</field>
<field id="personal_discount" group="customer">personalDiscount</field>
<field id="discount_card_number" group="customer">discountCardNumber</field>
<field id="email_marketing_unsubscribed_at" group="customer">subscribed</field>
<field id="address.index" group="customerAddress">index</field>
<field id="address.country" group="customerAddress">countryIso</field>

2
intaro.retailcrm/classes/general/events/RetailCrmEvent.php
View file

@ -74,7 +74,7 @@ class RetailCrmEvent
public static function OnBeforeUserUpdate(&$arFields)
{
if (isset($GLOBALS['RETAIL_CRM_HISTORY']) && $GLOBALS['RETAIL_CRM_HISTORY']) {
return false;
return true;
}
if (empty($arFields['UF_SUBSCRIBE_USER_EMAIL'])) {

19
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View file

@ -198,7 +198,9 @@ class RetailCrmHistory
);
}
$u = $newUser->Update($customer['externalId'], $customerBuilder->getCustomer()->getObjectToArray());
$customerArray = $customerBuilder->getCustomer()->getObjectToArray();
$u = $newUser->Update($customer['externalId'], self::convertBooleanFields($customerArray));
if (!$u) {
RCrmActions::eventLog(
'RetailCrmHistory::customerHistory',
@ -2088,4 +2090,19 @@ class RetailCrmHistory
);
}
}
/**
* @param array $array
* @return array
*/
public static function convertBooleanFields($array)
{
foreach ($array as $key => $value) {
if ($value === 'N') {
$array[$key] = false;
}
}
return $array;
}
}