From f8acb7833ee168158a4179b093beb531c88ec432 Mon Sep 17 00:00:00 2001 From: Ivan Chaplygin Date: Fri, 11 Aug 2023 17:47:00 +0300 Subject: [PATCH] =?UTF-8?q?ref=20#91040=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/general/events/RetailCrmEvent.php | 1 - .../general/history/RetailCrmHistory_v5.php | 31 ++++++------ .../lib/component/handlers/eventshandlers.php | 47 ------------------- 3 files changed, 17 insertions(+), 62 deletions(-) diff --git a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php index 383a7551..ba524c0d 100644 --- a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php +++ b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php @@ -13,7 +13,6 @@ use Bitrix\Sale\Order; use Intaro\RetailCrm\Component\ConfigProvider; use Intaro\RetailCrm\Model\Api\Response\OrdersCreateResponse; use Intaro\RetailCrm\Model\Api\Response\OrdersEditResponse; -use Logger; /** * Class RetailCrmEvent diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index df5ebe4f..3fe712e9 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -156,13 +156,7 @@ class RetailCrmHistory if ($registerNewUser === true) { $customerBuilder->buildPassword(); - $customerArray = $customerBuilder->getCustomer()->getObjectToArray(); - - if (!array_key_exists('UF_SUBSCRIBE_USER_EMAIL', $customerArray)) { - $customerArray['UF_SUBSCRIBE_USER_EMAIL'] = 'Y'; - } - - $registeredUserID = $newUser->Add(self::convertBooleanFields($customerArray)); + $registeredUserID = $newUser->Add(self::getDataUser($customerBuilder)); if ($registeredUserID === false) { RCrmActions::eventLog( @@ -932,13 +926,7 @@ class RetailCrmHistory } if ($registerNewUser === true) { - $customerArray = $customerBuilder->getCustomer()->getObjectToArray(); - - if (!array_key_exists('UF_SUBSCRIBE_USER_EMAIL', $customerArray)) { - $customerArray['UF_SUBSCRIBE_USER_EMAIL'] = 'Y'; - } - - $registeredUserID = $newUser->Add(self::convertBooleanFields($customerArray)); + $registeredUserID = $newUser->Add(self::getDataUser($customerBuilder)); if ($registeredUserID === false) { RCrmActions::eventLog( @@ -2119,4 +2107,19 @@ class RetailCrmHistory return $array; } + + /** + * @param $customerBuilder + * @return array + */ + private static function getDataUser($customerBuilder) + { + $customerArray = $customerBuilder->getCustomer()->getObjectToArray(); + + if (!array_key_exists('UF_SUBSCRIBE_USER_EMAIL', $customerArray)) { + $customerArray['UF_SUBSCRIBE_USER_EMAIL'] = 'Y'; + } + + return self::convertBooleanFields($customerArray); + } } diff --git a/intaro.retailcrm/lib/component/handlers/eventshandlers.php b/intaro.retailcrm/lib/component/handlers/eventshandlers.php index e12e05f1..053895c8 100644 --- a/intaro.retailcrm/lib/component/handlers/eventshandlers.php +++ b/intaro.retailcrm/lib/component/handlers/eventshandlers.php @@ -214,51 +214,4 @@ class EventsHandlers Logger::getInstance()->write(GetMessage('CAN_NOT_SAVE_ORDER') . $exception->getMessage(), 'uploadApiErrors'); } } - - /** - * Регистрирует пользователя в CRM системе после регистрации на сайте - * - * @param array $arFields - * @return mixed - * @throws \ReflectionException - */ - public static function OnAfterUserRegisterHandler(array $arFields): void - { - if (isset($arFields['USER_ID']) && $arFields['USER_ID'] > 0) { - $user = UserRepository::getById($arFields['USER_ID']); - - if (isset($_POST['REGISTER']['PERSONAL_PHONE'])) { - $phone = htmlspecialchars($_POST['REGISTER']['PERSONAL_PHONE']); - - if ($user !== null) { - $user->setPersonalPhone($phone); - $user->save(); - } - - $arFields['PERSONAL_PHONE'] = $phone; - } - - /* @var CustomerService $customerService */ - $customerService = ServiceLocator::get(CustomerService::class); - $customer = $customerService->createModel($arFields['USER_ID']); - - $customerService->createOrUpdateCustomer($customer); - - //Если пользователь выразил желание зарегистрироваться в ПЛ и согласился со всеми правилами - if ((int) $arFields['UF_REG_IN_PL_INTARO'] === 1 - && (int) $arFields['UF_AGREE_PL_INTARO'] === 1 - && (int) $arFields['UF_PD_PROC_PL_INTARO'] === 1 - ) { - $phone = $arFields['PERSONAL_PHONE'] ?? ''; - $card = $arFields['UF_CARD_NUM_INTARO'] ?? ''; - $customerId = (string) $arFields['USER_ID']; - - /** @var LoyaltyAccountService $service */ - $service = ServiceLocator::get(LoyaltyAccountService::class); - $createResponse = $service->createLoyaltyAccount($phone, $card, $customerId); - - $service->activateLpUserInBitrix($createResponse, $arFields['USER_ID']); - } - } - } }