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

add provider suffix to config provider name

Browse source
This commit is contained in:
Pavel 2020-03-06 17:09:21 +03:00 • committed by gorokh
parent a4d941ebec
commit f62c50603b
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
intaro.retailcrm/classes/general/RetailcrmConfig.php → intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
View file

@ -3,7 +3,7 @@
/**
* PHP version 5.3
*
* RetailcrmConfig class
* RetailcrmConfigProvider class
*
* @category RetailCrm
* @package RetailCrm
@ -17,7 +17,7 @@ IncludeModuleLangFile(__FILE__);
/**
* PHP version 5.3
*
* RetailcrmConfig class
* RetailcrmConfigProvider class
*
* @category RetailCrm
* @package RetailCrm
@ -25,7 +25,7 @@ IncludeModuleLangFile(__FILE__);
* @license https://opensource.org/licenses/MIT MIT License
* @link http://www.retailcrm.ru/docs/Developers/ApiVersion4
*/
class RetailcrmConfig
class RetailcrmConfigProvider
{
/** @var bool|null|string */
private static $apiUrl;

26
intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
View file

@ -366,16 +366,16 @@ class RetailCrmOrder
return false;
}
$optionsSitesList = RetailcrmConfig::getSitesList();
$optionsOrderTypes = RetailcrmConfig::getOrderTypes();
$optionsDelivTypes = RetailcrmConfig::getDeliveryTypes();
$optionsPayTypes = RetailcrmConfig::getPaymentTypes();
$optionsPayStatuses = RetailcrmConfig::getPaymentStatuses(); // --statuses
$optionsPayment = RetailcrmConfig::getPayment();
$optionsOrderProps = RetailcrmConfig::getOrderProps();
$optionsLegalDetails = RetailcrmConfig::getLegalDetails();
$optionsContragentType = RetailcrmConfig::getContragentTypes();
$optionsCustomFields = RetailcrmConfig::getCustomFields();
$optionsSitesList = RetailcrmConfigProvider::getSitesList();
$optionsOrderTypes = RetailcrmConfigProvider::getOrderTypes();
$optionsDelivTypes = RetailcrmConfigProvider::getDeliveryTypes();
$optionsPayTypes = RetailcrmConfigProvider::getPaymentTypes();
$optionsPayStatuses = RetailcrmConfigProvider::getPaymentStatuses(); // --statuses
$optionsPayment = RetailcrmConfigProvider::getPayment();
$optionsOrderProps = RetailcrmConfigProvider::getOrderProps();
$optionsLegalDetails = RetailcrmConfigProvider::getLegalDetails();
$optionsContragentType = RetailcrmConfigProvider::getContragentTypes();
$optionsCustomFields = RetailcrmConfigProvider::getCustomFields();
$getSite = function ($key) use ($optionsSitesList) {
if ($optionsSitesList) {
@ -389,7 +389,7 @@ class RetailCrmOrder
return null;
};
$api = new RetailCrm\ApiClient(RetailcrmConfig::getApiUrl(), RetailcrmConfig::getApiKey());
$api = new RetailCrm\ApiClient(RetailcrmConfigProvider::getApiUrl(), RetailcrmConfigProvider::getApiKey());
$arParams = array(
'optionsOrderTypes' => $optionsOrderTypes,
@ -424,7 +424,7 @@ class RetailCrmOrder
continue;
}
if ("Y" == RetailcrmConfig::getCorporateClient()
if ("Y" == RetailcrmConfigProvider::getCorporateClient()
&& $optionsContragentType[$order['PERSON_TYPE_ID']] == 'legal-entity'
) {
// TODO check if order is corporate, and if it IS - make corporate order
@ -522,7 +522,7 @@ class RetailCrmOrder
return false;
}
if ("Y" == RetailcrmConfig::getCorporateClient()) {
if ("Y" == RetailcrmConfigProvider::getCorporateClient()) {
foreach ($resOrders as $packKey => $pack) {
foreach ($pack as $key => $orderData) {
if (isset($orderData['contragent']['contragentType'])