From 212d922ab31193cca55b4826f18c15e442f0a54b Mon Sep 17 00:00:00 2001 From: Grisha Pomadchin Date: Mon, 8 Jul 2013 15:08:14 +0400 Subject: [PATCH] Changed api class, added opt fields, gen fixes. --- intaro.crm/classes/general/RestApi.php | 441 +++++++++++++++++++++++++ intaro.crm/include.php | 3 +- intaro.crm/install/index.php | 50 +-- intaro.crm/install/step2.php | 168 ++++++---- intaro.crm/install/version.php | 2 +- intaro.crm/lang/ru/install/step2.php | 7 +- intaro.crm/lang/ru/options.php | 8 +- intaro.crm/options.php | 186 +++++++---- 8 files changed, 696 insertions(+), 169 deletions(-) create mode 100644 intaro.crm/classes/general/RestApi.php diff --git a/intaro.crm/classes/general/RestApi.php b/intaro.crm/classes/general/RestApi.php new file mode 100644 index 00000000..cef13009 --- /dev/null +++ b/intaro.crm/classes/general/RestApi.php @@ -0,0 +1,441 @@ +apiUrl = $crmUrl.'/api/v'.$this->apiVersion.'/'; + $this->apiKey = $apiKey; + } + + + public function getStatusCode() + { + return $this->statusCode; + } + + /* Получение кода статуса и сообщения об ошибке */ + public function getLastError() + { + if (!is_null($this->lastError)) + return $this->statusCode . ' ' . $this->lastError; + else + return null; + } + + /* Псообщения об ошибке */ + public function getLastErrorMessage() + { + return $this->lastError; + } + + + /* Методы для работы с заказами */ + /** + * Получение заказа по id + * + * @param string $id - идентификатор заказа + * @return array - информация о заказе + */ + public function orderGet($id) + { + $url = $this->apiUrl.'orders/'.$id; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Создание заказа + * + * @param array $order- информация о заказе + * @return array + */ + public function orderCreate($order) + { + $dataJson = json_encode($order); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['order'] = $dataJson; + + $url = $this->apiUrl.'orders/create'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + /** + * Изменение заказа + * + * @param array $order- информация о заказе + * @return array + */ + public function orderEdit($order) + { + $dataJson = json_encode($order); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['order'] = $dataJson; + + $url = $this->apiUrl.'orders/'.$order['id'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + /** + * Загрузка нескольких заказов + * + * @param array $orders - массив заказов + * @return array + */ + public function orderUpload($orders) + { + $dataJson = json_encode($orders); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['orders'] = $dataJson; + + $url = $this->apiUrl.'orders/upload'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + /** + * Удаление заказа + * + * @param string $id - идентификатор заказа + * @return array + */ + public function orderDelete($id) + { + $url = $this->apiUrl.'orders/'.$id.'/delete'; + $result = $this->curlRequest($url, array(), 'POST'); + return $result; + } + + /** + * Получение последних измененных заказов + * + * @param DateTime $startDate - начальная дата выборки + * @param DateTime $endDate - конечная дата + * @param int $limit - ограничение на размер выборки + * @param int $offset - сдвиг + * @return array - массив заказов + */ + public function orderHistory($startDate = null, $endDate = null, $limit = 100, $offset = 0) + { + $url = $this->apiUrl.'orders/history'; + $parameters = array(); + $parameters['startDate'] = $startDate; + $parameters['endDate'] = $endDate; + $parameters['limit'] = $limit; + $parameters['offset'] = $offset; + + $result = $this->curlRequest($url, $parameters); + return $result; + } + + + /* Методы для работы с клиентами */ + /** + * Получение клиента по id + * + * @param string $id - идентификатор + * @return array - информация о клиенте + */ + public function customerGet($id) + { + $url = $this->apiUrl.'customers/'.$id; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Создание клиента + * + * @param array $customer - информация о клиенте + * @return array + */ + public function customerCreate($customer) + { + $dataJson = json_encode($customer); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['customer'] = $dataJson; + + $url = $this->apiUrl.'customers/create'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + /** + * Редактирование клиента + * + * @param array $customer - информация о клиенте + * @return array + */ + public function customerEdit($customer) + { + $dataJson = json_encode($customer); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['customer'] = $dataJson; + + $url = $this->apiUrl.'customers/'.$customer['id'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + /** + * Удаление клиента + * + * @param string $id - идентификатор + * @return array + */ + public function customerDelete($id) + { + $url = $this->apiUrl.'customers/'.$id.'/delete'; + $result = $this->curlRequest($url, array(), 'POST'); + return $result; + } + + /** + * Получение списка заказов клиента + * + * @param string $id - идентификатор клиента + * @param DateTime $startDate - начальная дата выборки + * @param DateTime $endDate - конечная дата + * @param int $limit - ограничение на размер выборки + * @param int $offset - сдвиг + * @return array - массив заказов + */ + public function customerOrdersList($id, $startDate = null, $endDate = null, + $limit = 100, $offset = 0) + { + $url = $this->apiUrl.'customers/'.$id.'/orders'; + $parameters = array(); + $parameters['startDate'] = $startDate; + $parameters['endDate'] = $endDate; + $parameters['limit'] = $limit; + $parameters['offset'] = $offset; + + $result = $this->curlRequest($url, $parameters); + return $result; + } + + /* Методы для работы со справочниками */ + /** + * Получение списка типов доставки + * + * @return array - массив типов доставки + */ + public function deliveryTypesList() + { + $url = $this->apiUrl.'reference/delivery-types'; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Редактирование типа доставки + * + * @param array $deliveryType - информация о типе доставки + * @return array + */ + public function deliveryTypeEdit($deliveryType) + { + $dataJson = json_encode($deliveryType); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['deliveryType'] = $dataJson; + + $url = $this->apiUrl.'delivery-types/'.$deliveryType['code'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + + /** + * Получение списка типов оплаты + * + * @return array - массив типов оплаты + */ + public function paymentTypesList() + { + $url = $this->apiUrl.'reference/payment-types'; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Редактирование типа оплаты + * + * @param array $paymentType - информация о типе оплаты + * @return array + */ + public function paymentTypesEdit($paymentType) + { + $dataJson = json_encode($paymentType); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['paymentType'] = $dataJson; + + $url = $this->apiUrl.'payment-types/'.$paymentType['code'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + + /** + * Получение списка статусов оплаты + * + * @return array - массив статусов оплаты + */ + public function paymentStatusesList() + { + $url = $this->apiUrl.'reference/payment-statuses'; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Редактирование статуса оплаты + * + * @param array $paymentStatus - информация о статусе оплаты + * @return array + */ + public function paymentStatusesEdit($paymentStatus) + { + $dataJson = json_encode($paymentStatus); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['paymentStatus'] = $dataJson; + + $url = $this->apiUrl.'payment-statuses/'.$paymentStatus['code'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + + /** + * Получение списка типов заказа + * + * @return array - массив типов заказа + */ + public function orderTypesList() + { + $url = $this->apiUrl.'reference/order-types'; + $result = $this->curlRequest($url); + return $result; + } + + /** + * Редактирование типа заказа + * + * @param array $paymentType - информация о типе заказа + * @return array + */ + public function orderTypesEdit($orderType) + { + $dataJson = json_encode($orderType); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $parameters = array(); + $parameters['orderType'] = $dataJson; + + $url = $this->apiUrl.'order-types/'.$paymentType['code'].'/edit'; + $result = $this->curlRequest($url, $parameters, 'POST'); + return $result; + } + + + + + protected function curlRequest($url, $parameters = null, $method = 'GET', $format = 'json') + { + $parameters['apiKey'] = $this->apiKey; + + if ($method == 'GET' && !is_null($parameters)) + $url .= '?'.http_build_query($parameters); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_FAILONERROR, FALSE); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable + curl_setopt($ch, CURLOPT_TIMEOUT, 3); // times out after 3s + + if ($method == 'POST') + { + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters); + } + + $response = curl_exec($ch); + $this->statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + + if (curl_errno($ch)) + { + $this->lastError = 'Curl error: ' . curl_error($ch); + return null; + } + curl_close($ch); + + $result = (array)json_decode($response, true); + if ($result['success'] == false) + { + $this->lastError = $result['errorMsg']; + return null; + } + + $this->lastError = null; + unset($result['success']); + if (count($result) == 0) + return true; + return reset($result); + } +} + +?> diff --git a/intaro.crm/include.php b/intaro.crm/include.php index 59995fc7..8acabe55 100644 --- a/intaro.crm/include.php +++ b/intaro.crm/include.php @@ -2,8 +2,7 @@ CModule::AddAutoloadClasses( 'intaro.crm', // module name array ( - 'IntaroCrmRestApi' => 'classes/general/IntaroCrmRestApi.php', - 'ICrmApi' => 'classes/general/ICrmApi.php' + 'IntaroCrm\RestApi' => 'classes/general/RestApi.php' ) ); ?> diff --git a/intaro.crm/install/index.php b/intaro.crm/install/index.php index b3394895..767dff67 100644 --- a/intaro.crm/install/index.php +++ b/intaro.crm/install/index.php @@ -28,6 +28,8 @@ class intaro_crm extends CModule var $CRM_DELIVERY_TYPES_ARR = 'deliv_types_arr'; var $CRM_PAYMENT_TYPES = 'pay_types_arr'; var $CRM_PAYMENT_STATUSES = 'pay_statuses_arr'; + var $CRM_PAYMENT = 'payment_arr'; //order payment Y/N + var $INSTALL_PATH; @@ -55,8 +57,8 @@ class intaro_crm extends CModule { global $APPLICATION, $step, $arResult; - include($this->INSTALL_PATH . '/../classes/general/ICrmApi.php'); - + include($this->INSTALL_PATH . '/../classes/general/RestApi.php'); + $step = intval($_REQUEST['step']); if ($step <= 1) { @@ -81,7 +83,7 @@ class intaro_crm extends CModule return; } - $this->INTARO_CRM_API = new ICrmApi($api_host, $api_key); + $this->INTARO_CRM_API = new \IntaroCrm\RestApi($api_host, $api_key); $this->INTARO_CRM_API->paymentStatusesList(); @@ -104,7 +106,8 @@ class intaro_crm extends CModule $arResult['orderTypesList'] = $this->INTARO_CRM_API->orderTypesList(); $arResult['deliveryTypesList'] = $this->INTARO_CRM_API->deliveryTypesList(); $arResult['paymentTypesList'] = $this->INTARO_CRM_API->paymentTypesList(); - $arResult['paymentStatusesList'] = $this->INTARO_CRM_API->paymentStatusesList(); + $arResult['paymentStatusesList'] = $this->INTARO_CRM_API->paymentStatusesList(); // --statuses + //$arResult['payment'] = $this->INTARO_CRM_API->getPymentsList() -- not exist //bitrix orderTypesList -- personTypes $dbOrderTypesList = CSalePersonType::GetList( @@ -163,7 +166,7 @@ class intaro_crm extends CModule } while ($arPaymentTypesList = $dbPaymentTypesList->Fetch()); } - //bitrix paymentStatusesList + //bitrix paymentStatusesList --statuses $dbPaymentStatusesList = CSaleStatus::GetList( array( "SORT" => "ASC", @@ -181,12 +184,12 @@ class intaro_crm extends CModule } while ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()); } - $APPLICATION->IncludeAdminFile( + $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step2.php' ); - } else if ($step == 3) { + } else if ($step == 3) { if(!CModule::IncludeModule("sale")) { //handler } @@ -206,14 +209,14 @@ class intaro_crm extends CModule ); //form order types ids arr - $orderTypesArr = array(); + $orderTypesArr = array(); if ($arOrderTypesList = $dbOrderTypesList->Fetch()) { do { - $orderTypesArr[$arOrderTypesList['ID']] = $_POST['order-type-' . $arOrderTypesList['ID']]; + $orderTypesArr[$arOrderTypesList['ID']] = htmlspecialchars(trim($_POST['order-type-' . $arOrderTypesList['ID']])); } while ($arOrderTypesList = $dbOrderTypesList->Fetch()); } - - //bitrix deliveryTypesList + + //bitrix deliveryTypesList $dbDeliveryTypesList = CSaleDelivery::GetList( array( "SORT" => "ASC", @@ -228,14 +231,14 @@ class intaro_crm extends CModule ); //form delivery types ids arr - $deliveryTypesArr = array(); + $deliveryTypesArr = array(); if ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()) { do { - $deliveryTypesArr[$arDeliveryTypesList['ID']] = $_POST['delivery-type-' . $arDeliveryTypesList['ID']]; + $deliveryTypesArr[$arDeliveryTypesList['ID']] = htmlspecialchars(trim($_POST['delivery-type-' . $arDeliveryTypesList['ID']])); } while ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()); } - //bitrix paymentTypesList + //bitrix paymentTypesList $dbPaymentTypesList = CSalePaySystem::GetList( array( "SORT" => "ASC", @@ -247,14 +250,14 @@ class intaro_crm extends CModule ); //form payment types ids arr - $paymentTypesArr = array(); + $paymentTypesArr = array(); if ($arPaymentTypesList = $dbPaymentTypesList->Fetch()) { do { - $paymentTypesArr[$arPaymentTypesList['ID']] = $_POST['payment-type-' . $arPaymentTypesList['ID']]; + $paymentTypesArr[$arPaymentTypesList['ID']] = htmlspecialchars(trim($_POST['payment-type-' . $arPaymentTypesList['ID']])); } while ($arPaymentTypesList = $dbPaymentTypesList->Fetch()); } - //bitrix paymentStatusesList + //bitrix paymentStatusesList $dbPaymentStatusesList = CSaleStatus::GetList( array( "SORT" => "ASC", @@ -270,14 +273,20 @@ class intaro_crm extends CModule $paymentStatusesArr = array(); if ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()) { do { - $paymentStatusesArr[$arPaymentStatusesList['ID']] = $_POST['payment-status-' . $arPaymentStatusesList['ID']]; + $paymentStatusesArr[$arPaymentStatusesList['ID']] = htmlspecialchars(trim($_POST['payment-status-' . $arPaymentStatusesList['ID']])); } while ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()); } + + //form payment ids arr + $paymentArr = array(); + $paymentArr['Y'] = htmlspecialchars(trim($_POST['payment-Y'])); + $paymentArr['N'] = htmlspecialchars(trim($_POST['payment-N'])); COption::SetOptionString($this->MODULE_ID, $this->CRM_ORDER_TYPES_ARR, serialize($orderTypesArr)); - COption::SetOptionString($this->MODULE_ID, $this->CRM_DELIVERY_TYPES_ARR, serialize($deliveryTypesArr)); + COption::SetOptionString($this->MODULE_ID, $this->CRM_DELIVERY_TYPES_ARR, serialize($deliveryTypesArr)); COption::SetOptionString($this->MODULE_ID, $this->CRM_PAYMENT_TYPES, serialize($paymentTypesArr)); COption::SetOptionString($this->MODULE_ID, $this->CRM_PAYMENT_STATUSES, serialize($paymentStatusesArr)); + COption::SetOptionString($this->MODULE_ID, $this->CRM_PAYMENT, serialize($paymentArr)); RegisterModule($this->MODULE_ID); $APPLICATION->IncludeAdminFile( @@ -297,11 +306,12 @@ class intaro_crm extends CModule COption::RemoveOption($this->MODULE_ID, $this->CRM_DELIVERY_TYPES_ARR); COption::RemoveOption($this->MODULE_ID, $this->CRM_PAYMENT_TYPES); COption::RemoveOption($this->MODULE_ID, $this->CRM_PAYMENT_STATUSES); + COption::RemoveOption($this->MODULE_ID, $this->CRM_PAYMENT); $APPLICATION->IncludeAdminFile( GetMessage('MODULE_UNINSTALL_TITLE'), $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/unstep1.php' - ); + ); } } ?> diff --git a/intaro.crm/install/step2.php b/intaro.crm/install/step2.php index cf99b677..32046691 100644 --- a/intaro.crm/install/step2.php +++ b/intaro.crm/install/step2.php @@ -1,4 +1,12 @@ - +
@@ -10,91 +18,111 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - -
- - -
+ + + -
- - -
+ + + -
- - -
+ + + +
+ + + -
- - -
+ + + -
+ + + + +
" class="adm-btn-save">
diff --git a/intaro.crm/install/version.php b/intaro.crm/install/version.php index b2a1360f..560d26eb 100644 --- a/intaro.crm/install/version.php +++ b/intaro.crm/install/version.php @@ -1,6 +1,6 @@ '0.2a', - 'VERSION_DATE' => '2013-07-05 21:08:00', + 'VERSION_DATE' => '2013-07-08 15:04:00', ); ?> diff --git a/intaro.crm/lang/ru/install/step2.php b/intaro.crm/lang/ru/install/step2.php index 895e1481..574d2360 100644 --- a/intaro.crm/lang/ru/install/step2.php +++ b/intaro.crm/lang/ru/install/step2.php @@ -3,6 +3,9 @@ $MESS ['STEP_NAME'] = 'Шаг 2'; $MESS ['MOD_NEXT_STEP'] = 'Следующий шаг'; $MESS ['DELIVERY_TYPES_LIST'] = 'Способы доставки'; $MESS ['PAYMENT_TYPES_LIST'] = 'Способы оплаты'; -$MESS ['PAYMENT_STATUS_LIST'] = 'Статусы оплаты'; -$MESS ['ORDER_TYPES_LIST'] = 'Типы плательщиков'; +$MESS ['PAYMENT_STATUS_LIST'] = 'Статусы'; +$MESS ['ORDER_TYPES_LIST'] = 'Типы заказа'; +$MESS ['PAYMENT_LIST'] = 'Оплата'; +$MESS ['PAYMENT_Y'] = 'Оплачен'; +$MESS ['PAYMENT_N'] = 'Не оплачен'; ?> diff --git a/intaro.crm/lang/ru/options.php b/intaro.crm/lang/ru/options.php index 698bcbe9..9c639de5 100644 --- a/intaro.crm/lang/ru/options.php +++ b/intaro.crm/lang/ru/options.php @@ -5,10 +5,14 @@ $MESS ['ICRM_CONN_SETTINGS'] = 'Настройка соединения'; $MESS ['ICRM_API_HOST'] = 'Адрес Intaro CRM:'; $MESS ['ICRM_API_KEY'] = 'Ключ авторизации:'; -$MESS ['ICRM_OPTIONS_CATALOG_TAB'] = 'Настройка каталогов'; +$MESS ['ICRM_OPTIONS_CATALOG_TAB'] = 'Настройка справочников'; $MESS ['DELIVERY_TYPES_LIST'] = 'Способы доставки'; $MESS ['PAYMENT_TYPES_LIST'] = 'Способы оплаты'; -$MESS ['PAYMENT_STATUS_LIST'] = 'Статусы оплаты'; +$MESS ['PAYMENT_STATUS_LIST'] = 'Статусы'; +$MESS ['ORDER_TYPES_LIST'] = 'Типы заказа'; +$MESS ['PAYMENT_LIST'] = 'Оплата'; +$MESS ['PAYMENT_Y'] = 'Оплачен'; +$MESS ['PAYMENT_N'] = 'Не оплачен'; $MESS ['ICRM_OPTIONS_SUBMIT_TITLE'] = 'Сохранить настройки'; $MESS ['ICRM_OPTIONS_SUBMIT_VALUE'] = 'Сохранить'; diff --git a/intaro.crm/options.php b/intaro.crm/options.php index 023f8c15..7ec8d250 100644 --- a/intaro.crm/options.php +++ b/intaro.crm/options.php @@ -3,6 +3,14 @@ IncludeModuleLangFile(__FILE__); $mid = 'intaro.crm'; $uri = $APPLICATION->GetCurPage() . '?mid=' . htmlspecialchars($mid) . '&lang=' . LANGUAGE_ID; +$CRM_API_HOST_OPTION = 'api_host'; +$CRM_API_KEY_OPTION = 'api_key'; +$CRM_ORDER_TYPES_ARR = 'order_types_arr'; +$CRM_DELIVERY_TYPES_ARR = 'deliv_types_arr'; +$CRM_PAYMENT_TYPES = 'pay_types_arr'; +$CRM_PAYMENT_STATUSES = 'pay_statuses_arr'; +$CRM_PAYMENT = 'payment_arr'; //order payment Y/N + CModule::IncludeModule('intaro.crm'); CModule::IncludeModule('sale'); @@ -20,7 +28,7 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { $api_key = htmlspecialchars(trim($_POST['api_key'])); if($api_host && $api_key) { - $api = new ICrmApi($api_host, $api_key); + $api = new IntaroCrm\RestApi($api_host, $api_key); $api->paymentStatusesList(); @@ -49,7 +57,7 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { ); //form order types ids arr - $orderTypesArr = array(); + $orderTypesArr = array(); if ($arOrderTypesList = $dbOrderTypesList->Fetch()) { do { $orderTypesArr[$arOrderTypesList['ID']] = $_POST['order-type-' . $arOrderTypesList['ID']]; @@ -68,73 +76,80 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { false, false, array() - ); + ); - //form delivery types ids arr + //form delivery types ids arr $deliveryTypesArr = array(); - if ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()) { - do { - $deliveryTypesArr[$arDeliveryTypesList['ID']] = $_POST['delivery-type-' . $arDeliveryTypesList['ID']]; - } while ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()); - } + if ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()) { + do { + $deliveryTypesArr[$arDeliveryTypesList['ID']] = htmlspecialchars(trim($_POST['delivery-type-' . $arDeliveryTypesList['ID']])); + } while ($arDeliveryTypesList = $dbDeliveryTypesList->Fetch()); + } - //bitrix paymentTypesList - $dbPaymentTypesList = CSalePaySystem::GetList( - array( - "SORT" => "ASC", - "NAME" => "ASC" - ), - array( - "ACTIVE" => "Y" - ) - ); + //bitrix paymentTypesList + $dbPaymentTypesList = CSalePaySystem::GetList( + array( + "SORT" => "ASC", + "NAME" => "ASC" + ), + array( + "ACTIVE" => "Y" + ) + ); - //form payment types ids arr - $paymentTypesArr = array(); - if ($arPaymentTypesList = $dbPaymentTypesList->Fetch()) { - do { - $paymentTypesArr[$arPaymentTypesList['ID']] = $_POST['payment-type-' . $arPaymentTypesList['ID']]; - } while ($arPaymentTypesList = $dbPaymentTypesList->Fetch()); - } + //form payment types ids arr + $paymentTypesArr = array(); + if ($arPaymentTypesList = $dbPaymentTypesList->Fetch()) { + do { + $paymentTypesArr[$arPaymentTypesList['ID']] = htmlspecialchars(trim($_POST['payment-type-' . $arPaymentTypesList['ID']])); + } while ($arPaymentTypesList = $dbPaymentTypesList->Fetch()); + } - //bitrix paymentStatusesList - $dbPaymentStatusesList = CSaleStatus::GetList( - array( - "SORT" => "ASC", - "NAME" => "ASC" - ), - array( - "LID" => "ru", //ru - "ACTIVE" => "Y" + //bitrix paymentStatusesList + $dbPaymentStatusesList = CSaleStatus::GetList( + array( + "SORT" => "ASC", + "NAME" => "ASC" + ), + array( + "LID" => "ru", //ru + "ACTIVE" => "Y" ) - ); + ); - //form payment statuses ids arr - $paymentStatusesArr = array(); - if ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()) { - do { - $paymentStatusesArr[$arPaymentStatusesList['ID']] = $_POST['payment-status-' . $arPaymentStatusesList['ID']]; - } while ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()); - } - - COption::SetOptionString($mid, 'order_types_arr', serialize($orderTypesArr)); - COption::SetOptionString($mid, 'deliv_types_arr', serialize($deliveryTypesArr)); - COption::SetOptionString($mid, 'pay_types_arr', serialize($paymentTypesArr)); - COption::SetOptionString($mid, 'pay_statuses_arr', serialize($paymentStatusesArr)); + //form payment statuses ids arr + $paymentStatusesArr = array(); + if ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()) { + do { + $paymentStatusesArr[$arPaymentStatusesList['ID']] = htmlspecialchars(trim($_POST['payment-status-' . $arPaymentStatusesList['ID']])); + } while ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()); + } - $uri .= '&ok=Y'; - LocalRedirect($uri); + //form payment ids arr + $paymentArr = array(); + $paymentArr['Y'] = htmlspecialchars(trim($_POST['payment-Y'])); + $paymentArr['N'] = htmlspecialchars(trim($_POST['payment-N'])); + + COption::SetOptionString($mid, $CRM_ORDER_TYPES_ARR, serialize($orderTypesArr)); + COption::SetOptionString($mid, $CRM_DELIVERY_TYPES_ARR, serialize($deliveryTypesArr)); + COption::SetOptionString($mid, $CRM_PAYMENT_TYPES, serialize($paymentTypesArr)); + COption::SetOptionString($mid, $CRM_PAYMENT_STATUSES, serialize($paymentStatusesArr)); + COption::SetOptionString($mid, $CRM_PAYMENT, serialize($paymentArr)); + + $uri .= '&ok=Y'; + LocalRedirect($uri); } else { $api_host = COption::GetOptionString($mid, 'api_host', 0); $api_key = COption::GetOptionString($mid, 'api_key', 0); - $api = new ICrmApi($api_host, $api_key); + $api = new IntaroCrm\RestApi($api_host, $api_key); //prepare crm lists $arResult['orderTypesList'] = $api->orderTypesList(); $arResult['deliveryTypesList'] = $api->deliveryTypesList(); $arResult['paymentTypesList'] = $api->paymentTypesList(); - $arResult['paymentStatusesList'] = $api->paymentStatusesList(); + $arResult['paymentStatusesList'] = $api->paymentStatusesList(); // --statuses + //$arResult['payment'] = $this->INTARO_CRM_API->getPymentsList() -- not exist //bitrix orderTypesList -- personTypes $dbOrderTypesList = CSalePersonType::GetList( @@ -210,12 +225,19 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { $arResult['bitrixPaymentStatusesList'][] = $arPaymentStatusesList; } while ($arPaymentStatusesList = $dbPaymentStatusesList->Fetch()); } + + //bitrix pyament Y/N + $arResult['bitrixPaymentList'][0]['NAME'] = GetMessage('PAYMENT_Y'); + $arResult['bitrixPaymentList'][0]['ID'] = 'Y'; + $arResult['bitrixPaymentList'][1]['NAME'] = GetMessage('PAYMENT_N'); + $arResult['bitrixPaymentList'][1]['ID'] = 'N'; //saved cat params - $optionsOrderTypes = unserialize(COption::GetOptionString($mid, 'order_types_arr', 0)); - $optionsDelivTypes = unserialize(COption::GetOptionString($mid, 'deliv_types_arr', 0)); - $optionsPayTypes = unserialize(COption::GetOptionString($mid, 'pay_types_arr', 0)); - $optionsPayStatuses = unserialize(COption::GetOptionString($mid, 'pay_statuses_arr', 0)); + $optionsOrderTypes = unserialize(COption::GetOptionString($mid, $CRM_ORDER_TYPES_ARR, 0)); + $optionsDelivTypes = unserialize(COption::GetOptionString($mid, $CRM_DELIVERY_TYPES_ARR, 0)); + $optionsPayTypes = unserialize(COption::GetOptionString($mid, $CRM_PAYMENT_TYPES, 0)); + $optionsPayStatuses = unserialize(COption::GetOptionString($mid, $CRM_PAYMENT_STATUSES, 0)); // --statuses + $optionsPayment = unserialize(COption::GetOptionString($mid, $CRM_PAYMENT, 0)); $aTabs = array( array( @@ -293,31 +315,51 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { - - - - - + + + + + - + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -331,8 +373,8 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { - - + + BeginNextTab(); ?> Buttons(); ?>