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

Phone required

Browse Source
This commit is contained in:
DanielWeiser 2020-07-23 14:49:55 +03:00 committed by GitHub
parent a43881166b
commit ad73c0c1dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
View File

@ -517,6 +517,16 @@ class RetailcrmConfigProvider
return static::$shops; return static::$shops;
} }
/**
* isPhoneRequired
*
* @return bool|string|null
*/
public static function isPhoneRequired()
{
return COption::GetOptionString("main", "new_user_phone_required") === 'Y';
}
/** /**
* Wraps Bitrix COption::GetOptionString(...) * Wraps Bitrix COption::GetOptionString(...)
* *

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

@ -81,6 +81,13 @@ class RetailCrmHistory
continue; continue;
} }
if (RetailcrmConfigProvider::isPhoneRequired()) {
if (empty($customer['phones'])) {
Logger::getInstance()->write('$customer["phones"] is empty. Customer ' . $customer['id'] . ' cannot be created', 'createCustomerError');
continue;
}
}
if (isset($customer['externalId']) && !is_numeric($customer['externalId'])) { if (isset($customer['externalId']) && !is_numeric($customer['externalId'])) {
unset($customer['externalId']); unset($customer['externalId']);
} }
@ -368,6 +375,13 @@ class RetailCrmHistory
continue; continue;
} }
if (RetailcrmConfigProvider::isPhoneRequired()) {
if (empty($order['customer']['phones'])) {
Logger::getInstance()->write('$customer["phones"] is empty. Order ' . $order['id'] . ' cannot be created', 'createCustomerError');
continue;
}
}
$login = null; $login = null;
$registerNewUser = true; $registerNewUser = true;

1
intaro.retailcrm/lang/ru/options.php
View File

@ -104,3 +104,4 @@ $MESS['ROUND_HEADER'] = "При включенной опции округлен
$MESS['PURCHASE_ICML'] = "При включенной опции в генерации icml будет добавлен сброс закупочной цены на 0 если она не указана"; $MESS['PURCHASE_ICML'] = "При включенной опции в генерации icml будет добавлен сброс закупочной цены на 0 если она не указана";
$MESS['PURCHASE_HEADER'] = "Сброс закупочной цены в icml"; $MESS['PURCHASE_HEADER'] = "Сброс закупочной цены в icml";
$MESS['PHONE_REQUIRED'] = "В настройках главного модуля была включена опция «Номер телефона является обязательным», что может вызвать проблемы с обратной синхронизацией. Для корректной работы необходимо отключить данную опцию.";

4
intaro.retailcrm/options.php
View File

@ -60,6 +60,10 @@ if(!CModule::IncludeModule('intaro.retailcrm') || !CModule::IncludeModule('sale'
$_GET['errc'] = htmlspecialchars(trim($_GET['errc'])); $_GET['errc'] = htmlspecialchars(trim($_GET['errc']));
$_GET['ok'] = htmlspecialchars(trim($_GET['ok'])); $_GET['ok'] = htmlspecialchars(trim($_GET['ok']));
if (RetailcrmConfigProvider::isPhoneRequired()) {
echo ShowMessage(array("TYPE"=>"ERROR", "MESSAGE"=>GetMessage('PHONE_REQUIRED')));
}
if($_GET['errc']) echo CAdminMessage::ShowMessage(GetMessage($_GET['errc'])); if($_GET['errc']) echo CAdminMessage::ShowMessage(GetMessage($_GET['errc']));
if($_GET['ok'] && $_GET['ok'] == 'Y') echo CAdminMessage::ShowNote(GetMessage('ICRM_OPTIONS_OK')); if($_GET['ok'] && $_GET['ok'] == 'Y') echo CAdminMessage::ShowNote(GetMessage('ICRM_OPTIONS_OK'));