diff --git a/intaro.crm/classes/general/ICrmOrderActions.php b/intaro.crm/classes/general/ICrmOrderActions.php new file mode 100644 index 00000000..84ad3306 --- /dev/null +++ b/intaro.crm/classes/general/ICrmOrderActions.php @@ -0,0 +1,292 @@ +ConvertCharset($str, SITE_CHARSET, 'utf-8'); + } + + /** + * + * @global type $APPLICATION + * @param type $str in utf-8 + * @return type $str in SITE_CHARSET + */ + public static function fromJSON($str) { + global $APPLICATION; + + return $APPLICATION->ConvertCharset($str, 'utf-8', SITE_CHARSET); + } + + /** + * Mass order uploading func + */ + public static function uploadOrders() { + + //COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, 0); // -- for test + + if (!CModule::IncludeModule('iblock')) { + //handle err + self::eventLog('iblock', 'module not found'); + return false; + } + + if (!CModule::IncludeModule("sale")) { + //handle err + self::eventLog('sale', 'module not found'); + return false; + } + + if (!CModule::IncludeModule("catalog")) { + //handle err + self::eventLog('catalog', 'module not found'); + return false; + } + + $resOrders = array(); + + $dbOrder = CSaleOrder::GetList(); + + $lastUpOrderId = COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, 0); + $lastUpOrderIdNew = 0; + + $api_host = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_HOST_OPTION, 0); + $api_key = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_KEY_OPTION, 0); + + //saved cat params + $optionsOrderTypes = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_TYPES_ARR, 0)); + $optionsDelivTypes = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_DELIVERY_TYPES_ARR, 0)); + $optionsPayTypes = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_PAYMENT_TYPES, 0)); + $optionsPayStatuses = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_PAYMENT_STATUSES, 0)); // --statuses + $optionsPayment = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_PAYMENT, 0)); + + $api = new IntaroCrm\RestApi($api_host, $api_key); + + while ($arOrder = $dbOrder->GetNext()) { + if ($arOrder['ID'] <= $lastUpOrderId) //old orders not to upload + return true; + + if(!$lastUpOrderIdNew) + $lastUpOrderIdNew = $arOrder['ID']; + + $arFields = CSaleOrder::GetById($arOrder['ID']); + + if (empty($arFields)) { + //handle err + self::eventLog('empty($arFields)', 'incorrect order'); + + return false; + } + + $rsUser = CUser::GetByID($arFields['USER_ID']); + $arUser = $rsUser->Fetch(); + + // push customer (for crm) + $firstName = self::toJSON($arUser['NAME']); + $lastName = self::toJSON($arUser['LAST_NAME']); + $patronymic = self::toJSON($arUser['SECOND_NAME']); + + $phonePersonal = array( + 'number' => self::toJSON($arUser['PERSONAL_PHONE']), + 'type' => 'mobile' + ); + $phones[] = $phonePersonal; + + $phoneWork = array( + 'number' => self::toJSON($arUser['WORK_PHONE']), + 'type' => 'work' + ); + $phones[] = $phoneWork; + + $addressPersonal = array( + 'index' => self::toJSON($arUser['PERSONAL_ZIP']), + 'country' => self::toJSON(GetCountryByID($arUser['PERSONAL_COUNTRY'])), + 'city' => self::toJSON($arUser['PERSONAL_CITY']), + 'street' => self::toJSON($arUser['PERSONAL_STREET']), + 'building' => self::toJSON($arUser['UF_PERSONAL_BUILDING']), + 'flat' => self::toJSON($arUser['UF_PERSONAL_FLAT']), + 'notes' => self::toJSON($arUser['PERSONAL_NOTES']), + 'text' => self::toJSON($arUser['UF_PERSONAL_TEXT']), + 'type' => 'home' + ); + $addresses[] = $addressPersonal; + + $addressWork = array( + 'index' => self::toJSON($arUser['WORK_ZIP']), + 'country' => self::toJSON(GetCountryByID($arUser['WORK_COUNTRY'])), + 'city' => self::toJSON($arUser['WORK_CITY']), + 'street' => self::toJSON($arUser['WORK_STREET']), + 'building' => self::toJSON($arUser['UF_WORK_BUILDING']), // -- + 'flat' => self::toJSON($arUser['UF_WORK_FLAT']), + 'notes' => self::toJSON($arUser['PERSONAL_NOTES']), + 'text' => self::toJSON($arUser['UF_WORK_TEXT']), + 'type' => 'work' + ); + $addresses[] = $addressWork; + + $result = array( + 'externalId' => $arFields['USER_ID'], + 'lastName' => $lastName, + 'firstName' => $firstName, + 'patronymic' => $patronymic, + 'phones' => $phones, + 'addresses' => $addresses + ); + + $customer = $api->customerEdit($result); + + // error pushing customer + if (!$customer) { + //handle err + self::eventLog('IntaroCrm\RestApi::customerEdit', $api->getLastError()); + return false; + } + + // delivery types + $arId = array(); + if (strpos($arFields['DELIVERY_ID'], ":") !== false) + $arId = explode(":", $arFields["DELIVERY_ID"]); + + if ($arId) + $resultDeliveryTypeId = $arId[0]; + else + $resultDeliveryTypeId = $arFields['DELIVERY_ID']; + + + $resOrder = array(); + $resOrderDeliveryAddress = array(); + + $rsOrderProps = CSaleOrderPropsValue::GetList(array(), array('ORDER_ID' => $arFields['ID'])); + while ($ar = $rsOrderProps->Fetch()) { + switch ($ar['CODE']) { + case 'ZIP': $resOrderDeliveryAddress['index'] = self::toJSON($ar['VALUE']); + break; + case 'CITY': $resOrderDeliveryAddress['city'] = self::toJSON($ar['VALUE']); + break; + case 'ADDRESS': $resOrderDeliveryAddress['text'] = self::toJSON($ar['VALUE']); + break; + case 'FIO': $resOrder['contactName'] = self::toJSON($ar['VALUE']); + break; + case 'PHONE': $resOrder['phone'] = $ar['VALUE']; + break; + case 'EMAIL': $resOrder['email'] = $ar['VALUE']; + break; + } + } + + $resOrder['deliveryCost'] = $arFields['PRICE_DELIVERY']; + $resOrder['summ'] = $arFields['PRICE']; + $resOrder['markDateTime'] = $arFields['DATE_MARKED']; + $resOrder['externalId'] = $arFields['ID']; + $resOrder['customerId'] = $arFields['USER_ID']; + + $resOrder['paymentType'] = $optionsPayTypes[$arFields['PAY_SYSTEM_ID']]; + $resOrder['paymentStatus'] = $optionsPayment[$arFields['PAYED']]; + $resOrder['orderType'] = $optionsOrderTypes[$arFields['PERSON_TYPE_ID']]; + $resOrder['deliveryType'] = $optionsDelivTypes[$resultDeliveryTypeId]; + $resOrder['status'] = $optionsPayStatuses[$arFields['STATUS_ID']]; + + $resOrder['deliveryAddress'] = $resOrderDeliveryAddress; + + $items = array(); + + $rsOrderBasket = CSaleBasket::GetList(array('PRODUCT_ID' => 'ASC'), array('ORDER_ID' => $arFields['ID'])); + while ($p = $rsOrderBasket->Fetch()) { + $pr = CCatalogProduct::GetList(array('ID' => $p['PRODUCT_ID']))->Fetch(); + if($pr) + $pr = $pr['PURCHASING_PRICE']; + else + $pr = ''; + + $items[] = array( + 'price' => $p['PRICE'], + 'purchasePrice' => $pr, + 'discount' => $p['DISCOUNT_VALUE'], + 'quantity' => $p['QUANTITY'], + 'productId' => $p['PRODUCT_ID'], + 'productName' => self::toJSON($p['NAME']) + ); + } + + $resOrder['items'] = $items; + $resOrders[] = $resOrder; + } + + $orders = $api->orderUpload($resOrders); + + // error pushing orders + if(!$orders) { + //handle err + self::eventLog('IntaroCrm\RestApi::orderUpload', $api->getLastError()); + return false; + } + + COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastUpOrderIdNew); + + return true; //all ok! + } + + /** + * + * w event in bitrix log + * @param type $auditType + * @param type $itemId + * @param type $description + */ + private static function eventLog($itemId, $description) { + CEventLog::Add(array( + "SEVERITY" => "SECURITY", + "AUDIT_TYPE_ID" => 'ICrmOrderActions::uploadOrders', + "MODULE_ID" => self::$MODULE_ID, + "ITEM_ID" => $itemId, + "DESCRIPTION" => $description, + )); + + self::sendEmail($itemId, $description); + } + + private static function sendEmail($itemId, $description) { + $title = 'Error: Intaro CRM.'; + $text = 'Error: ' . $itemId . ' - ' . $description; + $to = COption::GetOptionString("main", "email_from"); + $from = COption::GetOptionString("main", "email_from"); + mail($to, $title, $text, 'From:'.$from); + } + + /** + * + * Agent function + * + * @return self name + */ + + public static function uploadOrdersAgent() { + + if(self::uploadOrders()) + return 'ICrmOrderActions::uploadOrdersAgent();'; + + else return; + + } + +} +?> diff --git a/intaro.crm/classes/general/ICrmApi.php b/intaro.crm/classes/general/RestApi.php similarity index 67% rename from intaro.crm/classes/general/ICrmApi.php rename to intaro.crm/classes/general/RestApi.php index c6d67794..9900cebe 100644 --- a/intaro.crm/classes/general/ICrmApi.php +++ b/intaro.crm/classes/general/RestApi.php @@ -1,6 +1,7 @@ apiUrl = $crmUrl.'/api/v'.$this->apiVersion.'/'; $this->apiKey = $apiKey; + $this->parameters = array('apiKey' => $this->apiKey); } @@ -70,11 +73,15 @@ class ICrmApi * Получение заказа по id * * @param string $id - идентификатор заказа + * @param string $by - поиск заказа по id или externalId * @return array - информация о заказе */ - public function orderGet($id) + public function orderGet($id, $by = 'externalId') { $url = $this->apiUrl.'orders/'.$id; + + if ($by != 'externalId') + $this->parameters['by'] = $by; $result = $this->curlRequest($url); return $result; } @@ -90,11 +97,10 @@ class ICrmApi $dataJson = json_encode($order); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['order'] = $dataJson; + $this->parameters['order'] = $dataJson; $url = $this->apiUrl.'orders/create'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -109,11 +115,10 @@ class ICrmApi $dataJson = json_encode($order); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['order'] = $dataJson; + $this->parameters['order'] = $dataJson; - $url = $this->apiUrl.'orders/'.$order['id'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $url = $this->apiUrl.'orders/'.$order['externalId'].'/edit'; + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -128,11 +133,10 @@ class ICrmApi $dataJson = json_encode($orders); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['orders'] = $dataJson; + $this->parameters['orders'] = $dataJson; $url = $this->apiUrl.'orders/upload'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -140,12 +144,15 @@ class ICrmApi * Удаление заказа * * @param string $id - идентификатор заказа + * @param string $by - поиск заказа по id или externalId * @return array */ - public function orderDelete($id) + public function orderDelete($id, $by = 'externalId') { $url = $this->apiUrl.'orders/'.$id.'/delete'; - $result = $this->curlRequest($url, array(), 'POST'); + if ($by != 'externalId') + $this->parameters['by'] = $by; + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -161,13 +168,12 @@ class ICrmApi 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; + $this->parameters['startDate'] = $startDate; + $this->parameters['endDate'] = $endDate; + $this->parameters['limit'] = $limit; + $this->parameters['offset'] = $offset; - $result = $this->curlRequest($url, $parameters); + $result = $this->curlRequest($url); return $result; } @@ -177,11 +183,14 @@ class ICrmApi * Получение клиента по id * * @param string $id - идентификатор + * @param string $by - поиск заказа по id или externalId * @return array - информация о клиенте */ - public function customerGet($id) + public function customerGet($id, $by = 'externalId') { $url = $this->apiUrl.'customers/'.$id; + if ($by != 'externalId') + $this->parameters['by'] = $by; $result = $this->curlRequest($url); return $result; } @@ -197,11 +206,10 @@ class ICrmApi $dataJson = json_encode($customer); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['customer'] = $dataJson; + $this->parameters['customer'] = $dataJson; $url = $this->apiUrl.'customers/create'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -216,11 +224,10 @@ class ICrmApi $dataJson = json_encode($customer); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['customer'] = $dataJson; + $this->parameters['customer'] = $dataJson; - $url = $this->apiUrl.'customers/'.$customer['id'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $url = $this->apiUrl.'customers/'.$customer['externalId'].'/edit'; + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -228,12 +235,15 @@ class ICrmApi * Удаление клиента * * @param string $id - идентификатор + * @param string $by - поиск заказа по id или externalId * @return array */ - public function customerDelete($id) + public function customerDelete($id, $by = 'externalId') { $url = $this->apiUrl.'customers/'.$id.'/delete'; - $result = $this->curlRequest($url, array(), 'POST'); + if ($by != 'externalId') + $this->parameters['by'] = $by; + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -241,6 +251,7 @@ class ICrmApi * Получение списка заказов клиента * * @param string $id - идентификатор клиента + * @param string $by - поиск заказа по id или externalId * @param DateTime $startDate - начальная дата выборки * @param DateTime $endDate - конечная дата * @param int $limit - ограничение на размер выборки @@ -248,16 +259,17 @@ class ICrmApi * @return array - массив заказов */ public function customerOrdersList($id, $startDate = null, $endDate = null, - $limit = 100, $offset = 0) + $limit = 100, $offset = 0, $by = 'externalId') { $url = $this->apiUrl.'customers/'.$id.'/orders'; - $parameters = array(); - $parameters['startDate'] = $startDate; - $parameters['endDate'] = $endDate; - $parameters['limit'] = $limit; - $parameters['offset'] = $offset; + if ($by != 'externalId') + $this->parameters['by'] = $by; + $this->parameters['startDate'] = $startDate; + $this->parameters['endDate'] = $endDate; + $this->parameters['limit'] = $limit; + $this->parameters['offset'] = $offset; - $result = $this->curlRequest($url, $parameters); + $result = $this->curlRequest($url); return $result; } @@ -285,14 +297,14 @@ class ICrmApi $dataJson = json_encode($deliveryType); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['deliveryType'] = $dataJson; + $this->parameters['deliveryType'] = $dataJson; $url = $this->apiUrl.'delivery-types/'.$deliveryType['code'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } + /** * Получение списка типов оплаты * @@ -316,11 +328,10 @@ class ICrmApi $dataJson = json_encode($paymentType); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['paymentType'] = $dataJson; + $this->parameters['paymentType'] = $dataJson; $url = $this->apiUrl.'payment-types/'.$paymentType['code'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } @@ -348,14 +359,14 @@ class ICrmApi $dataJson = json_encode($paymentStatus); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['paymentStatus'] = $dataJson; + $this->parameters['paymentStatus'] = $dataJson; $url = $this->apiUrl.'payment-statuses/'.$paymentStatus['code'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $result = $this->curlRequest($url, 'POST'); return $result; } + /** * Получение списка типов заказа * @@ -371,7 +382,7 @@ class ICrmApi /** * Редактирование типа заказа * - * @param array $paymentType - информация о типе заказа + * @param array $orderType - информация о типе заказа * @return array */ public function orderTypesEdit($orderType) @@ -379,36 +390,82 @@ class ICrmApi $dataJson = json_encode($orderType); $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, $dataJson); - $parameters = array(); - $parameters['orderType'] = $dataJson; + $this->parameters['orderType'] = $dataJson; - $url = $this->apiUrl.'order-types/'.$paymentType['code'].'/edit'; - $result = $this->curlRequest($url, $parameters, 'POST'); + $url = $this->apiUrl.'order-types/'.$orderType['code'].'/edit'; + $result = $this->curlRequest($url, 'POST'); return $result; } - protected function curlRequest($url, $parameters = null, $method = 'GET', $format = 'json') + /** + * Получение списка статусов заказа + * + * @return array - массив статусов заказа + */ + public function orderStatusesList() { - $parameters['apiKey'] = $this->apiKey; + $url = $this->apiUrl.'reference/statuses'; + $result = $this->curlRequest($url); + return $result; + } - if ($method == 'GET' && !is_null($parameters)) - $url .= '?'.http_build_query($parameters); + /** + * Редактирование статуса заказа + * + * @param array $status - информация о статусе заказа + * @return array + */ + public function orderStatusEdit($status) + { + $dataJson = json_encode($status); + $dataJson = str_replace(self::$jsonReplaceSource, self::$jsonReplaceTarget, + $dataJson); + $this->parameters['status'] = $dataJson; + + $url = $this->apiUrl.'statuses/'.$status['code'].'/edit'; + $result = $this->curlRequest($url, 'POST'); + return $result; + } + + + /** + * Получение списка групп статусов заказа + * + * @return array - массив групп статусов заказа + */ + public function orderStatusGroupsList() + { + $url = $this->apiUrl.'reference/status-groups'; + $result = $this->curlRequest($url); + return $result; + } + + + + + protected function curlRequest($url, $method = 'GET', $format = 'json') + { + if ($method == 'GET' && !is_null($this->parameters)) + $url .= '?'.http_build_query($this->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, 6); // times out after 6s + curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 30s if ($method == 'POST') { curl_setopt($ch, CURLOPT_POST, true); - curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters); + curl_setopt($ch, CURLOPT_POSTFIELDS, $this->parameters); } $response = curl_exec($ch); $this->statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + unset($this->parameters); + /* Сброс массива с параметрами */ + $this->parameters = array('apiKey' => $this->apiKey); if (curl_errno($ch)) { @@ -432,4 +489,4 @@ class ICrmApi } } -?> +?> \ No newline at end of file diff --git a/intaro.crm/include.php b/intaro.crm/include.php index 59995fc7..bedaf9b5 100644 --- a/intaro.crm/include.php +++ b/intaro.crm/include.php @@ -1,9 +1,9 @@ 'classes/general/IntaroCrmRestApi.php', - 'ICrmApi' => 'classes/general/ICrmApi.php' + 'IntaroCrm\RestApi' => 'classes/general/RestApi.php', + 'ICrmOrderActions' => 'classes/general/ICrmOrderActions.php' ) ); ?> diff --git a/intaro.crm/install/index.php b/intaro.crm/install/index.php index b3394895..8ad94915 100644 --- a/intaro.crm/install/index.php +++ b/intaro.crm/install/index.php @@ -28,6 +28,9 @@ 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 $CRM_ORDER_LAST_ID = 'order_last_id'; + var $INSTALL_PATH; @@ -55,8 +58,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 +84,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 +107,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['paymentList'] = $this->INTARO_CRM_API->orderStatusesList(); //bitrix orderTypesList -- personTypes $dbOrderTypesList = CSalePersonType::GetList( @@ -163,7 +167,7 @@ class intaro_crm extends CModule } while ($arPaymentTypesList = $dbPaymentTypesList->Fetch()); } - //bitrix paymentStatusesList + //bitrix paymentStatusesList --statuses $dbPaymentStatusesList = CSaleStatus::GetList( array( "SORT" => "ASC", @@ -181,12 +185,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 +210,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 +232,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 +251,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,16 +274,39 @@ 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)); + COption::SetOptionString($this->MODULE_ID, $this->CRM_ORDER_LAST_ID, 0); RegisterModule($this->MODULE_ID); + //agent + $dateAgent = new DateTime(); + $intAgent = new DateInterval('PT60S'); + $dateAgent->add($intAgent); + + CAgent::AddAgent( + "ICrmOrderActions::uploadOrdersAgent();", + $this->MODULE_ID, + "N", + 600, // interval - 10 mins + $dateAgent->format('d.m.Y H:i:s'), // date of first check + "Y", // агент активен + $dateAgent->format('d.m.Y H:i:s'), // date of first start + 30 + ); + $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step3.php' @@ -289,7 +316,8 @@ class intaro_crm extends CModule function DoUninstall() { global $APPLICATION; - + + CAgent::RemoveAgent("ICrmOrderActions::uploadOrdersAgent();", $this->MODULE_ID); UnRegisterModule($this->MODULE_ID); COption::RemoveOption($this->MODULE_ID, $this->CRM_API_HOST_OPTION); @@ -297,11 +325,13 @@ 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); + COption::RemoveOption($this->MODULE_ID, $this->CRM_ORDER_LAST_ID); $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..c65aac0c 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' => '0.3a', + 'VERSION_DATE' => '2013-07-10 16:49: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..9325bbe3 100644 --- a/intaro.crm/options.php +++ b/intaro.crm/options.php @@ -3,6 +3,15 @@ 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 +$CRM_ORDER_LAST_ID = 'order_last_id'; + CModule::IncludeModule('intaro.crm'); CModule::IncludeModule('sale'); @@ -20,7 +29,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 +58,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 +77,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); -} else { - $api_host = COption::GetOptionString($mid, 'api_host', 0); - $api_key = COption::GetOptionString($mid, 'api_key', 0); + //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)); - $api = new ICrmApi($api_host, $api_key); + $uri .= '&ok=Y'; + LocalRedirect($uri); +} else { + $api_host = COption::GetOptionString($mid, $CRM_API_HOST_OPTION, 0); + $api_key = COption::GetOptionString($mid, $CRM_API_KEY_OPTION, 0); + + $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['paymentList'] = $api->orderStatusesList(); //bitrix orderTypesList -- personTypes $dbOrderTypesList = CSalePersonType::GetList( @@ -210,12 +226,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( @@ -228,7 +251,7 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { "DIV" => "edit2", "TAB" => GetMessage('ICRM_OPTIONS_CATALOG_TAB'), "ICON" => '', - "TITLE" => GetMessage('ICRM_OPTIONS_IMPORT_CAPTION') + "TITLE" => GetMessage('ICRM_OPTIONS_CATALOG_CAPTION') ), ); $tabControl = new CAdminTabControl("tabControl", $aTabs); @@ -293,31 +316,51 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { - - - - - + + + + + - + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -331,8 +374,8 @@ if (isset($_POST['Update']) && $_POST['Update']=='Y') { - - + + BeginNextTab(); ?> Buttons(); ?>