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

used customerCorpBuilder on orderHistory

Browse source
This commit is contained in:
gorokh 2020-05-08 17:39:27 +03:00
parent 1d25481e9e
commit 38c0a7c20e
8 changed files with 69 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
intaro.retailcrm/classes/general/AdressBuilder.php
View file

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class AdressBuilder
*/

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

@ -1,7 +1,5 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class CustomerBuilder
*/
@ -174,18 +172,20 @@ class CustomerBuilder implements RetailcrmBuilderInterface
$login = uniqid('user_' . time()) . '@crm.com';
$this->dataCrm['email'] = $login;
} else {
switch ($this->dbUser->SelectedRowsCount()) {
case 0:
$login = $this->dataCrm['email'];
break;
case 1:
$arUser = $this->dbUser->Fetch();
$this->setRegisteredUserID($arUser['ID']);
$this->registerNewUser = false;
break;
default:
$login = uniqid('user_' . time()) . '@crm.com';
break;
if (isset($this->dbUser)) {
switch ($this->dbUser->SelectedRowsCount()) {
case 0:
$login = $this->dataCrm['email'];
break;
case 1:
$arUser = $this->dbUser->Fetch();
$this->setRegisteredUserID($arUser['ID']);
$this->registerNewUser = false;
break;
default:
$login = uniqid('user_' . time()) . '@crm.com';
break;
}
}
}

52
intaro.retailcrm/classes/general/CustomerCorpBuilder.php
View file

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class CustomerCorpBuilder
*/
@ -24,6 +21,9 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
protected $api;
public $dbUser;
public $registerNewUser;
public $registeredUserID;
public $addressBuilder;
/**
* CustomerCorpBuilder constructor.
@ -35,6 +35,7 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
$this->customer = new Customer();
$this->customerAddress = new CustomerAddress();
$this->buyerProfile = new BuyerProfile();
$this->addressBuilder = new AdressBuilder();
}
/**
@ -57,6 +58,16 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
return $this;
}
/**
* @param $registeredUserID
* @return $this
*/
public function setRegisteredUserID($registeredUserID)
{
$this->registeredUserID = $registeredUserID;
return $this;
}
public function build()
{
if (RetailCrmOrder::isOrderCorporate($this->dataCrm)) {
@ -123,7 +134,7 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
}
$login = null;
$registerNewUser = true;
$this->registerNewUser = true;
if (!isset($this->dataCrm['customer']['email']) || empty($this->dataCrm['customer']['email'])) {
if (RetailCrmOrder::isOrderCorporate($this->dataCrm) && !empty($this->corporateContact['email'])) {
@ -134,22 +145,23 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
$this->dataCrm['customer']['email'] = $login;
}
}
switch ($this->dbUser->SelectedRowsCount()) {
case 0:
$login = $this->dataCrm['customer']['email'];
break;
case 1:
$arUser = $this->dbUser->Fetch();
$registeredUserID = $arUser['ID'];
$registerNewUser = false;
break;
default:
$login = uniqid('user_' . time()) . '@crm.com';
break;
if (isset($this->dbUser)) {
switch ($this->dbUser->SelectedRowsCount()) {
case 0:
$login = $this->dataCrm['customer']['email'];
break;
case 1:
$arUser = $this->dbUser->Fetch();
$this->setRegisteredUserID($arUser['ID']);
$this->registerNewUser = false;
break;
default:
$login = uniqid('user_' . time()) . '@crm.com';
break;
}
}
if ($registerNewUser === true) {
if ( $this->registerNewUser === true) {
$userPassword = uniqid("R");
$userData = RetailCrmOrder::isOrderCorporate($this->dataCrm)
? $this->corporateContact
@ -179,8 +191,8 @@ class CustomerCorpBuilder implements RetailcrmBuilderInterface
{
if (RetailCrmOrder::isOrderCorporate($this->dataCrm) && !empty($this->dataCrm['company'])) {
$this->buyerProfile->setName($this->dataCrm['company']['name'])
->setPersonTypeId($this->dataCrm['contact']['externalId'])
->setUserId($this->contragentTypes['legal-entity']);
->setUserId($this->dataCrm['contact']['externalId'])
->setPersonTypeId($this->contragentTypes['legal-entity']);
}
}

3
intaro.retailcrm/classes/general/Model/BuyerProfile.php
View file

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class BuyerProfile
*/

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

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class Customer
*/

3
intaro.retailcrm/classes/general/Model/CustomerAddress.php
View file

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class CustomerAddress
*/

3
intaro.retailcrm/classes/general/Model/CustomerContragent.php
View file

@ -1,7 +1,4 @@
<?php
IncludeModuleLangFile(__FILE__);
/**
* Class CustomerContragent
*/

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

@ -76,7 +76,10 @@ class RetailCrmHistory
if (is_array($newResCustomer) && !empty($newResCustomer)) {
$customer = $newResCustomer;
} elseif ($newResCustomer === false) {
RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'retailCrmBeforeCustomerSave()', 'UserCrmId = ' . $customer['id'] . '. Sending canceled after retailCrmBeforeCustomerSave');
RCrmActions::eventLog(
'RetailCrmHistory::customerHistory',
'retailCrmBeforeCustomerSave()',
'UserCrmId = ' . $customer['id'] . '. Sending canceled after retailCrmBeforeCustomerSave');
continue;
}
@ -233,6 +236,7 @@ class RetailCrmHistory
}
Logger::getInstance()->write($order, 'assemblyOrderHistory');
$customerCorpBuilder = new CustomerCorpBuilder($api);
if (isset($order['deleted'])) {
if (isset($order['externalId'])) {
@ -285,119 +289,26 @@ class RetailCrmHistory
unset($order['customer']['externalId']);
}
$corporateContact = array();
$orderCustomerExtId = isset($order['customer']['externalId']) ? $order['customer']['externalId'] : null;
if (RetailCrmOrder::isOrderCorporate($order)) {
// Fetch contact only if we think it's data is not fully present in order
if (!empty($order['contact'])) {
if (isset($order['contact']['email'])) {
$corporateContact = $order['contact'];
$orderCustomerExtId = isset($corporateContact['externalId'])
? $corporateContact['externalId']
: null;
} else {
$response = false;
if (isset($order['contact']['externalId'])) {
$response = RCrmActions::apiMethod(
$api,
'customersGet',
__METHOD__,
$order['contact']['externalId'],
$order['site']
);
} elseif (isset($order['contact']['id'])) {
$response = RCrmActions::apiMethod(
$api,
'customersGetById',
__METHOD__,
$order['contact']['id'],
$order['site']
);
}
if ($response && isset($response['customer'])) {
$corporateContact = $response['customer'];
$orderCustomerExtId = isset($corporateContact['externalId'])
? $corporateContact['externalId']
: null;
}
}
}
}
$customerCorpBuilder->orderCustomerExtId = isset($order['customer']['externalId']) ? $order['customer']['externalId'] : null;
$customerCorpBuilder->setDataCrm($order)->build();
if (!isset($order['externalId'])) {
if (empty($orderCustomerExtId)) {
if (!isset($order['customer']['id'])
|| (RetailCrmOrder::isOrderCorporate($order)
&& (!isset($order['contact']['id']) || !isset($order['customer']['id'])))
) {
continue;
}
$login = null;
$registerNewUser = true;
if (!isset($order['customer']['email']) || empty($order['customer']['email'])) {
if (RetailCrmOrder::isOrderCorporate($order) && !empty($corporateContact['email'])) {
$login = $corporateContact['email'];
$order['customer']['email'] = $corporateContact['email'];
} else {
$login = uniqid('user_' . time()) . '@crm.com';
$order['customer']['email'] = $login;
}
}
$dbUser = CUser::GetList(
($by = 'ID'),
($sort = 'ASC'),
array('=EMAIL' => $order['customer']['email'])
if (empty($customerCorpBuilder->orderCustomerExtId)) {
$customerCorpBuilder->setDbUser(
CUser::GetList(
($by = 'ID'),
($sort = 'ASC'),
array('=EMAIL' => $order['customer']['email'])
)
);
switch ($dbUser->SelectedRowsCount()) {
case 0:
$login = $order['customer']['email'];
break;
case 1:
$arUser = $dbUser->Fetch();
$registeredUserID = $arUser['ID'];
$registerNewUser = false;
break;
default:
$login = uniqid('user_' . time()) . '@crm.com';
break;
}
if ($registerNewUser === true) {
$userPassword = uniqid("R");
$userData = RetailCrmOrder::isOrderCorporate($order)
? $corporateContact
: $order['customer'];
if ($customerCorpBuilder->registerNewUser === true) {
$newUser = new CUser();
$arFields = array(
"NAME" => RCrmActions::fromJSON($userData['firstName']),
"LAST_NAME" => RCrmActions::fromJSON($userData['lastName']),
"SECOND_NAME" => RCrmActions::fromJSON($userData['patronymic']),
"EMAIL" => $order['customer']['email'],
"LOGIN" => $login,
"ACTIVE" => "Y",
"PASSWORD" => $userPassword,
"CONFIRM_PASSWORD" => $userPassword
$customerCorpBuilder->setRegisteredUserID(
$newUser->Add($customerCorpBuilder->objectToArray($customerCorpBuilder->customer))
);
if ($userData['phones'][0]) {
$arFields['PERSONAL_PHONE'] = $userData['phones'][0];
}
if ($userData['phones'][1]) {
$arFields['PERSONAL_MOBILE'] = $userData['phones'][1];
}
$registeredUserID = $newUser->Add($arFields);
if ($registeredUserID === false) {
if ($customerCorpBuilder->registeredUserID === false) {
RCrmActions::eventLog(
'RetailCrmHistory::orderHistory',
'CUser::Register',
@ -413,16 +324,18 @@ class RetailCrmHistory
__METHOD__,
array(array(
'id' => $order['customer']['id'],
'externalId' => $registeredUserID
'externalId' => $customerCorpBuilder->registeredUserID
))) == false
) {
continue;
}
}
$orderCustomerExtId = isset($registeredUserID) ? $registeredUserID : null;
$customerCorpBuilder->orderCustomerExtId =
isset($customerCorpBuilder->registeredUserID) ? $customerCorpBuilder->registeredUserID : null;
}
//TO DO builder buyerProfile
$buyerProfileToAppend = array();
if (RetailCrmOrder::isOrderCorporate($order) && !empty($order['company'])) {
@ -447,7 +360,7 @@ class RetailCrmHistory
}
}
$newOrder = Bitrix\Sale\Order::create($site, $orderCustomerExtId, $currency);
$newOrder = Bitrix\Sale\Order::create($site, $customerCorpBuilder->orderCustomerExtId, $currency);
if (isset($buyerProfileToAppend['ID']) && isset($optionsLegalDetails['legalName'])) {
$newOrder->setFields(array(