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

upd +0.4.3

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-10-30 17:01:34 +04:00
parent 43cb653ee2
commit 45c180c40e
5 changed files with 2103 additions and 2085 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ class ICMLLoader {
$this->PrepareSettings(); $this->PrepareSettings();
$this->fp = $this->PrepareFile($this->filename); $this->fp = $this->PrepareFile($this->filename. '.tmp');
if ($this->isLogged) { if ($this->isLogged) {
$this->fpLog = $this->PrepareFile($this->logFile); $this->fpLog = $this->PrepareFile($this->logFile);
@ -57,6 +57,8 @@ class ICMLLoader {
$this->CloseFile($this->fp); $this->CloseFile($this->fp);
$this->CloseFile($this->fpLog); $this->CloseFile($this->fpLog);
unlink($_SERVER["DOCUMENT_ROOT"] . $this->filename);
rename($_SERVER["DOCUMENT_ROOT"] . $this->filename. '.tmp', $_SERVER["DOCUMENT_ROOT"] . $this->filename);
return true; return true;

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

@ -333,10 +333,13 @@ class ICrmOrderActions
); );
if(isset($order['number']) && $order['number']) if(isset($order['number']) && $order['number'])
$newOrderFields['ACCOUNT_NUMBER'] = $order['number']; $GLOBALS['ICRM_ACCOUNT_NUMBER'] = $order['number'];
$order['externalId'] = CSaleOrder::Add($newOrderFields); $order['externalId'] = CSaleOrder::Add($newOrderFields);
if(isset($GLOBALS['ICRM_ACCOUNT_NUMBER']))
unset($GLOBALS['ICRM_ACCOUNT_NUMBER']);
$api->orderFixExternalIds(array(array('id' => $order['id'], 'externalId' => $order['externalId']))); $api->orderFixExternalIds(array(array('id' => $order['id'], 'externalId' => $order['externalId'])));
if ($api->getStatusCode() != 200) { if ($api->getStatusCode() != 200) {

11
intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
View File

@ -249,4 +249,15 @@ class ICrmOrderEvent {
return true; return true;
} }
/**
*
* @param type $ID -- orderId
* @param type $value -- ACCOUNT_NUMBER
* @return boolean
*/
function onBeforeOrderAccountNumberSet($ID, $value) {
if(isset($GLOBALS['ICRM_ACCOUNT_NUMBER']) && $GLOBALS['ICRM_ACCOUNT_NUMBER'])
return $GLOBALS['ICRM_ACCOUNT_NUMBER'];
}
} }

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

@ -890,6 +890,7 @@ class intaro_intarocrm extends CModule {
RegisterModule($this->MODULE_ID); RegisterModule($this->MODULE_ID);
RegisterModuleDependences("sale", "OnSalePayOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSalePayOrder"); RegisterModuleDependences("sale", "OnSalePayOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSalePayOrder");
RegisterModuleDependences("sale", "OnSaleCancelOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSaleCancelOrder"); RegisterModuleDependences("sale", "OnSaleCancelOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSaleCancelOrder");
RegisterModuleDependences("sale", "OnBeforeOrderAccountNumberSet", $this->MODULE_ID, "ICrmOrderEvent", "onBeforeOrderAccountNumberSet");
$this->CopyFiles(); $this->CopyFiles();
if (isset($_POST['LOAD_NOW'])) { if (isset($_POST['LOAD_NOW'])) {
@ -1061,6 +1062,7 @@ class intaro_intarocrm extends CModule {
UnRegisterModuleDependences("sale", "OnOrderNewSendEmail", $this->MODULE_ID, "ICrmOrderEvent", "onSendOrderMail"); UnRegisterModuleDependences("sale", "OnOrderNewSendEmail", $this->MODULE_ID, "ICrmOrderEvent", "onSendOrderMail");
UnRegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "ICrmOrderEvent", "onUpdateOrder"); UnRegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "ICrmOrderEvent", "onUpdateOrder");
UnRegisterModuleDependences("sale", "OnBeforeOrderAdd", $this->MODULE_ID, "ICrmOrderEvent", "onBeforeOrderAdd"); UnRegisterModuleDependences("sale", "OnBeforeOrderAdd", $this->MODULE_ID, "ICrmOrderEvent", "onBeforeOrderAdd");
UnRegisterModuleDependences("sale", "OnBeforeOrderAccountNumberSet", $this->MODULE_ID, "ICrmOrderEvent", "onBeforeOrderAccountNumberSet");
if (CModule::IncludeModule("catalog")) { if (CModule::IncludeModule("catalog")) {
if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/' . $this->INTARO_CRM_EXPORT . '_run.php')) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/' . $this->INTARO_CRM_EXPORT . '_run.php')) {
$dbProfile = CCatalogExport::GetList(array(), array("FILE_NAME" => $this->INTARO_CRM_EXPORT)); $dbProfile = CCatalogExport::GetList(array(), array("FILE_NAME" => $this->INTARO_CRM_EXPORT));

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

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "0.4.3", "VERSION" => "0.4.3",
"VERSION_DATE" => "2013-10-29 15:28:00", "VERSION_DATE" => "2013-10-30 16:04:00",
); );