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

Merge pull request #8 from ghostrainman/master

Browse Source 
v.1.1.2
This commit is contained in:
Alex Lushpai 2015-05-20 10:50:08 +03:00
commit 7da2d5cdf0
5 changed files with 2165 additions and 2146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2015-05-18 v.1.1.2
* Добавлена возможность изменять файлы основных классов(ICMLLoader и ICrmOrderActions) и экспорт каталога без потери обновлений
* Исправлены мелкие ошибки
## 2015-03-19 v.1.1.1 ## 2015-03-19 v.1.1.1
* Исправлена ошибка, связанная с версионностью PHP в History. * Исправлена ошибка, связанная с версионностью PHP в History.
* Добавлена выгрузка закупочной цены вместе с заказом * Добавлена выгрузка закупочной цены вместе с заказом

6
intaro.intarocrm/classes/general/ICMLLoader.php
View File

@ -1,5 +1,8 @@
<?php <?php
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/ICMLLoader.php")){
require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/ICMLLoader.php");
}
else{
global $MESS; global $MESS;
IncludeModuleLangFile(__FILE__); IncludeModuleLangFile(__FILE__);
@ -540,3 +543,4 @@ class ICMLLoader {
return $offer; return $offer;
} }
} }
}

11
intaro.intarocrm/classes/general/ICrmOrderActions.php
View File

@ -1,4 +1,8 @@
<?php <?php
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/ICrmOrderActions.php")){
require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/ICrmOrderActions.php");
}
else{
IncludeModuleLangFile(__FILE__); IncludeModuleLangFile(__FILE__);
class ICrmOrderActions class ICrmOrderActions
{ {
@ -292,9 +296,9 @@ class ICrmOrderActions
} }
} }
if (function_exists('intarocrm_before_order_send')) { if (function_exists('intarocrm_before_order_send')) {
$newResOrder = intarocrm_before_order_send($resOrder); $newResOrder = intarocrm_before_order_send($order);
if (is_array($newResOrder) && !empty($newResOrder)) { if (is_array($newResOrder) && !empty($newResOrder)) {
$resOrder = $newResOrder; $order = $newResOrder;
} }
} }
@ -500,7 +504,7 @@ class ICrmOrderActions
'CANCELED' => 'N', 'CANCELED' => 'N',
'STATUS_ID' => 'N', 'STATUS_ID' => 'N',
'PRICE' => 0, 'PRICE' => 0,
'CURRENCY' => 'RUB', 'CURRENCY' => CCurrency::GetBaseCurrency(),
'USER_ID' => $order['customer']['externalId'], 'USER_ID' => $order['customer']['externalId'],
'PAY_SYSTEM_ID' => 0, 'PAY_SYSTEM_ID' => 0,
'PRICE_DELIVERY' => 0, 'PRICE_DELIVERY' => 0,
@ -1057,3 +1061,4 @@ class RetailUser extends CUser
} }
} }
} }
}

6
intaro.intarocrm/export/export_run.php
View File

@ -1,5 +1,8 @@
<?php <?php
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_run.php")){
require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_run.php");
}
else{
ignore_user_abort(true); ignore_user_abort(true);
set_time_limit(0); set_time_limit(0);
@ -81,3 +84,4 @@ $loader->serverName = $SERVER_NAME;
$loader->application = $APPLICATION; $loader->application = $APPLICATION;
$loader->loadPurchasePrice = $LOAD_PURCHASE_PRICE == 'Y'; $loader->loadPurchasePrice = $LOAD_PURCHASE_PRICE == 'Y';
$loader->Load(); $loader->Load();
}

7
intaro.intarocrm/export/export_setup.php
View File

@ -1,5 +1,8 @@
<? <?
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_setup.php")){
require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/php_interface/retailcrm/export_setup.php");
}
else{
$iblockProperties = Array( $iblockProperties = Array(
"article" => "article", "article" => "article",
"manufacturer" => "manufacturer", "manufacturer" => "manufacturer",
@ -695,5 +698,5 @@ elseif ($STEP==2)
COption::SetOptionString($MODULE_ID, $CRM_CATALOG_BASE_PRICE . '_' . $_REQUEST['PROFILE_ID'], htmlspecialchars(trim($_POST['price-types']))); COption::SetOptionString($MODULE_ID, $CRM_CATALOG_BASE_PRICE . '_' . $_REQUEST['PROFILE_ID'], htmlspecialchars(trim($_POST['price-types'])));
$FINITE = true; $FINITE = true;
} }
}
?> ?>