diff --git a/intaro.intarocrm/install/index.php b/intaro.intarocrm/install/index.php index d470f618..334ec133 100755 --- a/intaro.intarocrm/install/index.php +++ b/intaro.intarocrm/install/index.php @@ -58,10 +58,10 @@ class intaro_intarocrm extends CModule { global $APPLICATION, $step, $arResult; - if (!in_array('curl', get_loaded_extensions())) { - $APPLICATION->ThrowException( GetMessage("INTAROCRM_CURL_ERR") ); - return false; - } + if (!in_array('curl', get_loaded_extensions())) { + $APPLICATION->ThrowException(GetMessage("INTAROCRM_CURL_ERR")); + return false; + } include($this->INSTALL_PATH . '/../classes/general/RestApi.php'); include($this->INSTALL_PATH . '/../classes/general/ICrmOrderActions.php'); @@ -254,15 +254,9 @@ class intaro_intarocrm extends CModule $percent = 100 - round(($countLeft * 100 / $countAll), 1); - if(!$countLeft) { - $api_host = COption::GetOptionString($mid, $this->CRM_API_HOST_OPTION, 0); - $api_key = COption::GetOptionString($mid, $this->CRM_API_KEY_OPTION, 0); - $this->INTARO_CRM_API = new \IntaroCrm\RestApi($api_host, $api_key); - $this->INTARO_CRM_API->statisticUpdate(); + if(!$countLeft) $finish = 1; - } - - + $APPLICATION->RestartBuffer(); header('Content-Type: application/x-javascript; charset='.LANG_CHARSET); die(json_encode(array("finish" => $finish, "percent" => $percent))); @@ -397,7 +391,13 @@ class intaro_intarocrm extends CModule ); $this->CopyFiles(); - + + // statistic update + $api_host = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_HOST_OPTION, 0); + $api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0); + $this->INTARO_CRM_API = new \IntaroCrm\RestApi($api_host, $api_key); + $this->INTARO_CRM_API->statisticUpdate(); + $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step4.php' diff --git a/intaro.intarocrm/install/version.php b/intaro.intarocrm/install/version.php index 14200c58..477013cf 100755 --- a/intaro.intarocrm/install/version.php +++ b/intaro.intarocrm/install/version.php @@ -1,5 +1,5 @@ '0.3.6', - 'VERSION_DATE' => '2013-07-29 12:29:00', + 'VERSION' => '0.3.7', + 'VERSION_DATE' => '2013-08-06 15:07:00', );