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

istallation fixes; diiscountPercent fix;

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-07-25 16:56:36 +04:00
parent 7bf2c2b8dc
commit abb2cdf7ea
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ class ICrmOrderActions
COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId); COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId);
return true; //all ok! return true; //all ok!
} }
/** /**
* *
@ -269,7 +269,10 @@ class ICrmOrderActions
$pr = $pr['PURCHASING_PRICE']; $pr = $pr['PURCHASING_PRICE'];
else else
$pr = ''; $pr = '';
if($p['DISCOUNT_VALUE'])
$p['DISCOUNT_PRICE'] = null;
$items[] = array( $items[] = array(
'initialPrice' => (double) $p['PRICE'] + (double) $p['DISCOUNT_PRICE'], 'initialPrice' => (double) $p['PRICE'] + (double) $p['DISCOUNT_PRICE'],
'purchasePrice' => $pr, 'purchasePrice' => $pr,

4
intaro.intarocrm/install/index.php
View File

@ -427,7 +427,7 @@ class intaro_intarocrm extends CModule
} }
function DeleteFiles() { function DeleteFiles() {
unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/crm_run.php'); unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_run.php');
unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/crm_setup.php'); unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php');
} }
} }

2
intaro.intarocrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
'VERSION' => '0.3.6', 'VERSION' => '0.3.6',
'VERSION_DATE' => '2013-07-25 15:29:00', 'VERSION_DATE' => '2013-07-25 16:55:00',
); );