ref #91040 перенесено событие OnAfterUserRegister
Инициализация ПЛ и подписки перенесена в один файл. Обновлен updater.php
This commit is contained in:
Ivan Chaplygin
parent
abef997fc3
commit
5c750e7397
5 changed files with 414 additions and 9 deletions
|
|
@ -1,6 +1,10 @@
|
|||
<?php
|
||||
|
||||
use Bitrix\Main\Context\Culture;
|
||||
use Intaro\RetailCrm\Component\ServiceLocator;
|
||||
use Intaro\RetailCrm\Repository\UserRepository;
|
||||
use Intaro\RetailCrm\Service\CustomerService;
|
||||
use Intaro\RetailCrm\Service\LoyaltyAccountService;
|
||||
use Intaro\RetailCrm\Service\ManagerService;
|
||||
use Bitrix\Sale\Payment;
|
||||
use Bitrix\Catalog\Model\Event;
|
||||
|
|
@ -651,6 +655,53 @@ class RetailCrmEvent
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Регистрирует пользователя в CRM системе после регистрации на сайте
|
||||
*
|
||||
* @param array $arFields
|
||||
* @return mixed
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public static function OnAfterUserRegister(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']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ use Bitrix\Sale\Internals\OrderTable;
|
|||
use Intaro\RetailCrm\Component\ConfigProvider;
|
||||
use Intaro\RetailCrm\Component\Installer\LoyaltyInstallerTrait;
|
||||
use Intaro\RetailCrm\Component\Installer\SubscriberInstallerTrait;
|
||||
use Intaro\RetailCrm\Component\Installer\InstallerTrait;
|
||||
use Intaro\RetailCrm\Service\OrderLoyaltyDataService;
|
||||
use Intaro\RetailCrm\Vendor\Symfony\Component\Process\PhpExecutableFinder;
|
||||
use RetailCrm\ApiClient;
|
||||
|
|
@ -32,11 +33,13 @@ if (class_exists('intaro_retailcrm')) {
|
|||
|
||||
include(__DIR__ . '/../lib/component/installer/loyaltyinstallertrait.php');
|
||||
include (__DIR__ . '/../lib/component/installer/subscriberinstallertrait.php');
|
||||
include (__DIR__ . '/../lib/component/installer/installertrait.php');
|
||||
|
||||
class intaro_retailcrm extends CModule
|
||||
{
|
||||
use LoyaltyInstallerTrait;
|
||||
use SubscriberInstallerTrait;
|
||||
//use LoyaltyInstallerTrait;
|
||||
//use SubscriberInstallerTrait;
|
||||
use InstallerTrait;
|
||||
|
||||
public const V5 = 'v5';
|
||||
public $MODULE_ID = 'intaro.retailcrm';
|
||||
|
|
@ -250,13 +253,17 @@ class intaro_retailcrm extends CModule
|
|||
include($this->INSTALL_PATH . '/../lib/component/apiclient/clientadapter.php');
|
||||
|
||||
$this->CopyFiles();
|
||||
$this->addLPUserFields();
|
||||
$this->addEvents();
|
||||
$this->addAgreement();
|
||||
$this->addUserFields();
|
||||
|
||||
/* $this->addLPUserFields();
|
||||
$this->addLPEvents();
|
||||
$this->addAgreement();
|
||||
|
||||
$this->CopyFilesSubscribe();
|
||||
$this->addSubscribeUserFields();
|
||||
$this->addSubscriberEvents();
|
||||
$this->addSubscriberEvents();*/
|
||||
|
||||
OrderLoyaltyDataService::createLoyaltyHlBlock();
|
||||
|
||||
|
|
@ -1077,6 +1084,8 @@ class intaro_retailcrm extends CModule
|
|||
RegisterModuleDependences('sale', 'OnSaleOrderDeleted', $this->MODULE_ID, 'RetailCrmEvent', 'orderDelete');
|
||||
RegisterModuleDependences('sale', 'OnSalePaymentEntitySaved', $this->MODULE_ID, 'RetailCrmEvent', 'paymentSave');
|
||||
RegisterModuleDependences('sale', 'OnSalePaymentEntityDeleted', $this->MODULE_ID, 'RetailCrmEvent', 'paymentDelete');
|
||||
RegisterModuleDependences('main', 'OnAfterUserRegister', $this->MODULE_ID, 'RetailCrmEvent', 'OnAfterUserRegister');
|
||||
|
||||
|
||||
COption::SetOptionString($this->MODULE_ID, $this->CRM_CATALOG_BASE_PRICE, htmlspecialchars(trim($_POST['price-types'])));
|
||||
COption::SetOptionString($this->MODULE_ID, $this->CRM_INVENTORIES_UPLOAD, 'N');
|
||||
|
|
@ -1276,6 +1285,7 @@ class intaro_retailcrm extends CModule
|
|||
UnRegisterModuleDependences('main', 'OnBeforeProlog', $this->MODULE_ID, 'RetailCrmUa', 'add');
|
||||
UnRegisterModuleDependences('sale', 'OnSalePaymentEntitySaved', $this->MODULE_ID, 'RetailCrmEvent', 'paymentSave');
|
||||
UnRegisterModuleDependences('sale', 'OnSalePaymentEntityDeleted', $this->MODULE_ID, 'RetailCrmEvent', 'paymentDelete');
|
||||
UnRegisterModuleDependences('main', 'OnAfterUserRegister', $this->MODULE_ID, 'RetailCrmEvent', 'OnAfterUserRegister');
|
||||
|
||||
if (
|
||||
CModule::IncludeModule('catalog')
|
||||
|
|
|
|||
|
|
@ -101,11 +101,7 @@ class Constants
|
|||
public const LP_EVENTS = [
|
||||
['EVENT_NAME' => 'OnSaleOrderSaved', 'FROM_MODULE' => 'sale'],
|
||||
['EVENT_NAME' => 'OnSaleComponentOrderResultPrepared', 'FROM_MODULE' => 'sale'],
|
||||
['EVENT_NAME' => 'OnAfterUserRegister', 'FROM_MODULE' => 'main'],
|
||||
];
|
||||
public const SUBSCRIBE_EVENTS = [
|
||||
['EVENT_NAME' => 'OnAfterUserRegister', 'FROM_MODULE' => 'main'],
|
||||
['EVENT_NAME' => 'OnAfterUserUpdate', 'FROM_MODULE' => 'main']
|
||||
//['EVENT_NAME' => 'OnAfterUserRegister', 'FROM_MODULE' => 'main'],
|
||||
];
|
||||
public const SITES_AVAILABLE = 'sites_available';
|
||||
}
|
||||
|
|
|
|||
257
intaro.retailcrm/lib/component/installer/installertrait.php
Normal file
257
intaro.retailcrm/lib/component/installer/installertrait.php
Normal file
|
|
@ -0,0 +1,257 @@
|
|||
<?php
|
||||
|
||||
namespace Intaro\RetailCrm\Component\Installer;
|
||||
|
||||
use Bitrix\Main\ArgumentException;
|
||||
use Bitrix\Main\EventManager;
|
||||
use Bitrix\Main\ObjectPropertyException;
|
||||
use Bitrix\Main\SystemException;
|
||||
use Bitrix\Main\Type\DateTime;
|
||||
use CUserTypeEntity;
|
||||
use Intaro\RetailCrm\Component\Constants;
|
||||
use Intaro\RetailCrm\Component\Handlers\EventsHandlers;
|
||||
use Intaro\RetailCrm\Model\Bitrix\Agreement;
|
||||
use Intaro\RetailCrm\Repository\AgreementRepository;
|
||||
use Intaro\RetailCrm\Repository\ToModuleRepository;
|
||||
use RCrmActions;
|
||||
|
||||
IncludeModuleLangFile(__FILE__);
|
||||
|
||||
trait InstallerTrait
|
||||
{
|
||||
/**
|
||||
* Создание событий для программы лояльности
|
||||
*/
|
||||
public function addEvents(): void
|
||||
{
|
||||
$eventManager = EventManager::getInstance();
|
||||
|
||||
foreach (Constants::LP_EVENTS as $event) {
|
||||
try {
|
||||
$events = ToModuleRepository::getCollectionByWhere(
|
||||
['ID'],
|
||||
[
|
||||
['from_module_id', '=', $event['FROM_MODULE']],
|
||||
['to_module_id', '=', Constants::MODULE_ID],
|
||||
['to_method', '=', $event['EVENT_NAME'] . 'Handler'],
|
||||
['to_class', '=', EventsHandlers::class],
|
||||
]
|
||||
);
|
||||
|
||||
if ($events !== null && count($events) === 0) {
|
||||
$eventManager->registerEventHandler(
|
||||
$event['FROM_MODULE'],
|
||||
$event['EVENT_NAME'],
|
||||
Constants::MODULE_ID,
|
||||
EventsHandlers::class,
|
||||
$event['EVENT_NAME'] . 'Handler'
|
||||
);
|
||||
}
|
||||
} catch (ObjectPropertyException | ArgumentException | SystemException $exception) {
|
||||
RCrmActions::eventLog(
|
||||
'intaro.retailcrm/install/index.php',
|
||||
'RetailCrm\ApiClient::addLPEvents',
|
||||
$exception->getMessage()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Перемещение модульных шаблонов в CMS
|
||||
*/
|
||||
public function CopyFiles(): void
|
||||
{
|
||||
$pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . Constants::MODULE_ID . '/install';
|
||||
|
||||
CopyDirFiles(
|
||||
$pathFrom . '/export',
|
||||
$_SERVER['DOCUMENT_ROOT'],
|
||||
true,
|
||||
true,
|
||||
false
|
||||
);
|
||||
|
||||
$templateNames = [
|
||||
'default_loyalty' => [
|
||||
'sale.order.ajax',
|
||||
'sale.basket.basket',
|
||||
'main.register',
|
||||
],
|
||||
|
||||
'default_subscribe' => [
|
||||
'sale.personal.section'
|
||||
]
|
||||
];
|
||||
|
||||
foreach ($templateNames as $directory => $names) {
|
||||
foreach ($names as $name) {
|
||||
$this->copy($directory, $name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add USER fields for LP
|
||||
*/
|
||||
public function addUserFields(): void
|
||||
{
|
||||
$this->addCustomUserFields(
|
||||
[
|
||||
[
|
||||
'name' => 'UF_CARD_NUM_INTARO',
|
||||
'title' => GetMessage('UF_CARD_NUMBER_INTARO_TITLE'),
|
||||
],
|
||||
],
|
||||
'string'
|
||||
);
|
||||
|
||||
$this->addCustomUserFields(
|
||||
[
|
||||
[
|
||||
'name' => 'UF_LP_ID_INTARO',
|
||||
'title' => GetMessage('UF_LP_ID_INTARO_TITLE'),
|
||||
],
|
||||
],
|
||||
'string',
|
||||
['EDIT_IN_LIST' => 'N']
|
||||
);
|
||||
|
||||
$this->addCustomUserFields(
|
||||
[
|
||||
[
|
||||
'name' => 'UF_REG_IN_PL_INTARO',
|
||||
'title' => GetMessage('UF_REG_IN_PL_INTARO_TITLE'),
|
||||
],
|
||||
[
|
||||
'name' => 'UF_AGREE_PL_INTARO',
|
||||
'title' => GetMessage('UF_AGREE_PL_INTARO_TITLE'),
|
||||
],
|
||||
[
|
||||
'name' => 'UF_PD_PROC_PL_INTARO',
|
||||
'title' => GetMessage('UF_PD_PROC_PL_INTARO_TITLE'),
|
||||
],
|
||||
[
|
||||
'name' => 'UF_EXT_REG_PL_INTARO',
|
||||
'title' => GetMessage('UF_EXT_REG_PL_INTARO_TITLE'),
|
||||
],
|
||||
[
|
||||
'name' => 'UF_SUBSCRIBE_USER_EMAIL',
|
||||
'title' => GetMessage('UF_SUBSCRIBE_USER_EMAIL_TITLE')
|
||||
]
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $fields
|
||||
* @param string $filedType
|
||||
* @param array $customProps
|
||||
*/
|
||||
public function addCustomUserFields($fields, string $filedType = 'boolean', array $customProps = []): void
|
||||
{
|
||||
foreach ($fields as $filed) {
|
||||
$arProps = [
|
||||
'ENTITY_ID' => 'USER',
|
||||
'FIELD_NAME' => $filed['name'],
|
||||
'USER_TYPE_ID' => $filedType,
|
||||
'MULTIPLE' => 'N',
|
||||
'MANDATORY' => 'N',
|
||||
'EDIT_FORM_LABEL' => ['ru' => $filed['title']],
|
||||
|
||||
];
|
||||
$props = array_merge($arProps, $customProps);
|
||||
$obUserField = new CUserTypeEntity();
|
||||
$dbRes = CUserTypeEntity::GetList([], ['FIELD_NAME' => $filed['name']])->fetch();
|
||||
|
||||
if (!$dbRes['ID']) {
|
||||
$obUserField->Add($props);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Добавление соглашений для формы регистрации
|
||||
*
|
||||
* @throws \Bitrix\Main\ArgumentException
|
||||
* @throws \Bitrix\Main\ObjectPropertyException
|
||||
* @throws \Bitrix\Main\SystemException
|
||||
*/
|
||||
public function addAgreement(): void
|
||||
{
|
||||
$isAgreementLoyaltyProgram = AgreementRepository::getFirstByWhere(
|
||||
['ID'],
|
||||
[
|
||||
['CODE', '=', Constants::AGREEMENT_LOYALTY_PROGRAM_CODE]
|
||||
]
|
||||
);
|
||||
|
||||
if (!isset($isAgreementLoyaltyProgram['ID'])) {
|
||||
$agreementLoyaltyProgram = new Agreement();
|
||||
$agreementLoyaltyProgram->setCode(Constants::AGREEMENT_LOYALTY_PROGRAM_CODE);
|
||||
$agreementLoyaltyProgram->setDateInsert(new DateTime());
|
||||
$agreementLoyaltyProgram->setActive('Y');
|
||||
$agreementLoyaltyProgram->setName(GetMessage('AGREEMENT_LOYALTY_PROGRAM_TITLE'));
|
||||
$agreementLoyaltyProgram->setType('C');
|
||||
$agreementLoyaltyProgram->setAgreementText(GetMessage('AGREEMENT_LOYALTY_PROGRAM_TEXT'));
|
||||
$agreementLoyaltyProgram->save();
|
||||
}
|
||||
|
||||
$isAgreementPersonalProgram = AgreementRepository::getFirstByWhere(
|
||||
['ID'],
|
||||
[
|
||||
['CODE', '=', Constants::AGREEMENT_PERSONAL_DATA_CODE]
|
||||
]
|
||||
);
|
||||
|
||||
if (!isset($isAgreementPersonalProgram['ID'])) {
|
||||
$agreementPersonalData = new Agreement();
|
||||
$agreementPersonalData->setCode(Constants::AGREEMENT_PERSONAL_DATA_CODE);
|
||||
$agreementPersonalData->setDateInsert(new DateTime());
|
||||
$agreementPersonalData->setActive('Y');
|
||||
$agreementPersonalData->setName(GetMessage('AGREEMENT_PERSONAL_DATA_TITLE'));
|
||||
$agreementPersonalData->setType('C');
|
||||
$agreementPersonalData->setAgreementText(GetMessage('AGREEMENT_PERSONAL_DATA_TEXT'));
|
||||
$agreementPersonalData->save();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* delete loyalty program events handlers
|
||||
*/
|
||||
private function deleteLPEvents(): void
|
||||
{
|
||||
$eventManager = EventManager::getInstance();
|
||||
|
||||
foreach (Constants::LP_EVENTS as $event){
|
||||
$eventManager->unRegisterEventHandler(
|
||||
$event['FROM_MODULE'],
|
||||
$event['EVENT_NAME'],
|
||||
$this->MODULE_ID,
|
||||
EventsHandlers::class,
|
||||
$event['EVENT_NAME'].'Handler'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private function copy($directory, $name): void
|
||||
{
|
||||
$templatePath = $_SERVER['DOCUMENT_ROOT']
|
||||
. '/local/templates/.default/components/bitrix/' . $name . '/'. $directory;
|
||||
|
||||
if (!file_exists($templatePath)) {
|
||||
$pathFrom = $_SERVER['DOCUMENT_ROOT']
|
||||
. '/bitrix/modules/intaro.retailcrm/install/export/local/components/intaro/'
|
||||
. $name
|
||||
. '/templates/.default';
|
||||
|
||||
CopyDirFiles(
|
||||
$pathFrom,
|
||||
$templatePath,
|
||||
true,
|
||||
true,
|
||||
false
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1074,6 +1074,92 @@ class LoyaltyProgramUpdater
|
|||
}
|
||||
}
|
||||
|
||||
class UpdateSubscribe
|
||||
{
|
||||
public function CopyFiles(): self
|
||||
{
|
||||
$pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/intaro.retailcrm/install';
|
||||
|
||||
CopyDirFiles(
|
||||
$pathFrom . '/export',
|
||||
$_SERVER['DOCUMENT_ROOT'],
|
||||
true,
|
||||
true,
|
||||
false
|
||||
);
|
||||
|
||||
$templateNames = [
|
||||
'default_subscribe' => [
|
||||
'sale.personal.section'
|
||||
]
|
||||
];
|
||||
|
||||
foreach ($templateNames as $directory => $names) {
|
||||
foreach ($names as $name) {
|
||||
$lpTemplatePath = $_SERVER['DOCUMENT_ROOT']
|
||||
. '/local/templates/.default/components/bitrix/' . $name . '/' . $directory;
|
||||
|
||||
if (!file_exists($lpTemplatePath)) {
|
||||
$pathFrom = $_SERVER['DOCUMENT_ROOT']
|
||||
. '/bitrix/modules/intaro.retailcrm/install/export/local/components/intaro/'
|
||||
. $name
|
||||
. '/templates/.default';
|
||||
|
||||
CopyDirFiles(
|
||||
$pathFrom,
|
||||
$lpTemplatePath,
|
||||
true,
|
||||
true,
|
||||
false
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function addEvent(): self
|
||||
{
|
||||
$eventManager = EventManager::getInstance();
|
||||
|
||||
$eventManager->unRegisterEventHandler(
|
||||
'main',
|
||||
'OnAfterUserRegister',
|
||||
'intaro.retailcrm',
|
||||
'Intaro\RetailCrm\Component\Handlers\EventsHandlers',
|
||||
'OnAfterUserRegisterHandler'
|
||||
);
|
||||
|
||||
RegisterModuleDependences('main', 'OnAfterUserRegister', 'intaro.retailcrm', 'RetailCrmEvent', 'OnAfterUserRegister');
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function addCustomUserField(): self
|
||||
{
|
||||
$arProps = [
|
||||
'ENTITY_ID' => 'USER',
|
||||
'FIELD_NAME' => 'UF_SUBSCRIBE_USER_EMAIL',
|
||||
'USER_TYPE_ID' => 'boolean',
|
||||
'MULTIPLE' => 'N',
|
||||
'MANDATORY' => 'N',
|
||||
'EDIT_FORM_LABEL' => ['ru' => 'Подписка на события'],
|
||||
|
||||
];
|
||||
|
||||
$props = array_merge($arProps, []);
|
||||
$obUserField = new CUserTypeEntity();
|
||||
$dbRes = CUserTypeEntity::GetList([], ['FIELD_NAME' => 'UF_SUBSCRIBE_USER_EMAIL'])->fetch();
|
||||
|
||||
if (!$dbRes['ID']) {
|
||||
$obUserField->Add($props);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws \Bitrix\Main\ArgumentException
|
||||
* @throws \Bitrix\Main\ObjectPropertyException
|
||||
|
|
@ -1093,6 +1179,11 @@ function update()
|
|||
UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmPricePrchase", "add");
|
||||
UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmDc", "add");
|
||||
UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmCc", "add");
|
||||
|
||||
(new UpdateSubscribe())
|
||||
->CopyFiles()
|
||||
->addEvent()
|
||||
->addCustomUserField();
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue