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

upd

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-08-27 18:05:55 +04:00
parent eda0e3b68b
commit fbd56c2512
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intaro.intarocrm/classes/general/RestApi.php
View File

@ -308,7 +308,7 @@ class RestApi
$dataJson = json_encode($deliveryType); $dataJson = json_encode($deliveryType);
$this->parameters['deliveryType'] = $dataJson; $this->parameters['deliveryType'] = $dataJson;
$url = $this->apiUrl.'delivery-types/'.$deliveryType['code'].'/edit'; $url = $this->apiUrl.'reference/delivery-types/'.$deliveryType['code'].'/edit';
$result = $this->curlRequest($url, 'POST'); $result = $this->curlRequest($url, 'POST');
return $result; return $result;
} }
@ -337,7 +337,7 @@ class RestApi
$dataJson = json_encode($paymentType); $dataJson = json_encode($paymentType);
$this->parameters['paymentType'] = $dataJson; $this->parameters['paymentType'] = $dataJson;
$url = $this->apiUrl.'payment-types/'.$paymentType['code'].'/edit'; $url = $this->apiUrl.'reference/payment-types/'.$paymentType['code'].'/edit';
$result = $this->curlRequest($url, 'POST'); $result = $this->curlRequest($url, 'POST');
return $result; return $result;
} }
@ -366,7 +366,7 @@ class RestApi
$dataJson = json_encode($paymentStatus); $dataJson = json_encode($paymentStatus);
$this->parameters['paymentStatus'] = $dataJson; $this->parameters['paymentStatus'] = $dataJson;
$url = $this->apiUrl.'payment-statuses/'.$paymentStatus['code'].'/edit'; $url = $this->apiUrl.'reference/payment-statuses/'.$paymentStatus['code'].'/edit';
$result = $this->curlRequest($url, 'POST'); $result = $this->curlRequest($url, 'POST');
return $result; return $result;
} }
@ -395,7 +395,7 @@ class RestApi
$dataJson = json_encode($orderType); $dataJson = json_encode($orderType);
$this->parameters['orderType'] = $dataJson; $this->parameters['orderType'] = $dataJson;
$url = $this->apiUrl.'order-types/'.$orderType['code'].'/edit'; $url = $this->apiUrl.'reference/order-types/'.$orderType['code'].'/edit';
$result = $this->curlRequest($url, 'POST'); $result = $this->curlRequest($url, 'POST');
return $result; return $result;
} }
@ -423,7 +423,7 @@ class RestApi
$dataJson = json_encode($status); $dataJson = json_encode($status);
$this->parameters['status'] = $dataJson; $this->parameters['status'] = $dataJson;
$url = $this->apiUrl.'statuses/'.$status['code'].'/edit'; $url = $this->apiUrl.'reference/statuses/'.$status['code'].'/edit';
$result = $this->curlRequest($url, 'POST'); $result = $this->curlRequest($url, 'POST');
return $result; return $result;
} }

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

@ -507,7 +507,7 @@ class intaro_intarocrm extends CModule
else else
$finish = (int) $_POST['finish']; $finish = (int) $_POST['finish'];
$percent = 100 - round(($countLeft * 100 / $countAll), 1); $percent = round(100 - ($countLeft * 100 / $countAll), 1);
if(!$countLeft) if(!$countLeft)
$finish = 1; $finish = 1;
@ -601,11 +601,12 @@ class intaro_intarocrm extends CModule
))); )));
// error pushing customer // error pushing customer
if (($this->INTARO_CRM_API->getStatusCode() != 200) if ($this->INTARO_CRM_API->getStatusCode() != 200) {
|| ($this->INTARO_CRM_API->getStatusCode() != 201)) { if ($this->INTARO_CRM_API->getStatusCode() != 201) {
//handle err //handle err
ICrmOrderActions::eventLog('install/index.php', 'IntaroCrm\RestApi::deliveryTypeEdit', $this->INTARO_CRM_API->getLastError()); ICrmOrderActions::eventLog('install/index.php', 'IntaroCrm\RestApi::deliveryTypeEdit', $this->INTARO_CRM_API->getLastError());
} }
}
} while ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()); } while ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch());
} }

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

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "0.3.9", "VERSION" => "0.3.9",
"VERSION_DATE" => "2013-08-21 18:32:00", "VERSION_DATE" => "2013-08-27 18:00:00",
); );