RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-21 21:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Добавление передачи контрагентов с типом ИП (#363)

Browse Source
This commit is contained in:
ellynoize 2024-09-23 13:21:59 +03:00 committed by GitHub
parent 74833ed2db
commit 1d2a87f277
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2024-09-23 v6.5.30
- Добавлена передача контрагентов с типом ИП
## 2024-09-19 v6.5.29
- Исправлена подписка модуля на событие сохранения заказа

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

@ -224,7 +224,7 @@ class RetailCrmEvent
//TODO эта управляющая конструкция по функционалу дублирует RetailCrmOrder::createCustomerForOrder.
// Необходимо устранить дублирование, вынеся логику в обособленный класс-сервис
if ('Y' === $optionCorpClient && $optionsContragentType[$arOrder['PERSON_TYPE_ID']] === 'legal-entity') {
if ('Y' === $optionCorpClient && in_array($optionsContragentType[$arOrder['PERSON_TYPE_ID']], ['legal-entity', 'enterpreneur'])) {
//corparate cliente
$nickName = '';
$address = '';

2
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View File

@ -672,7 +672,7 @@ class RetailCrmHistory
$personType = $newOrder->getField('PERSON_TYPE_ID');
if (RetailCrmOrder::isOrderCorporate($order)
|| (!empty($order['contragentType']) && $order['contragentType'] == 'legal-entity')
|| (!empty($order['contragentType']) && in_array($order['contragentType'], ['legal-entity', 'enterpreneur']))
) {
$personType = $contragentTypes['legal-entity'];
$newOrder->setField('PERSON_TYPE_ID', $personType);

6
intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
View File

@ -714,7 +714,7 @@ class RetailCrmOrder
if (
'Y' === RetailcrmConfigProvider::getCorporateClientStatus()
&& $optionsContragentType[$order['PERSON_TYPE_ID']] === 'legal-entity'
&& in_array($optionsContragentType[$order['PERSON_TYPE_ID']], ['legal-entity', 'enterpreneur'])
) {
// TODO check if order is corporate, and if it IS - make corporate order
$arCustomer = RetailCrmUser::customerSend(
@ -728,7 +728,7 @@ class RetailCrmOrder
$arCustomerCorporate = RetailCrmCorporateClient::clientSend(
$order,
$api,
'legal-entity',
$optionsContragentType[$order['PERSON_TYPE_ID']],
false,
true,
$site
@ -774,7 +774,7 @@ class RetailCrmOrder
if (
isset($orderData['contragent']['contragentType'])
&& $orderData['contragent']['contragentType'] === 'legal-entity'
&& in_array($orderData['contragent']['contragentType'], ['legal-entity', 'enterpreneur'])
&& !empty($customerLegalName)
) {
if (isset($cachedCorporateIds[$customerLegalName])) {

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Исправлена подписка модуля на событие сохранения заказа при установке
- Добавлена передача контрагентов с типом ИП

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php
$arModuleVersion = [
'VERSION' => '6.5.29',
'VERSION_DATE' => '2024-09-19 15:00:00'
'VERSION' => '6.5.30',
'VERSION_DATE' => '2024-09-23 15:00:00'
];