diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php index 7fde6192..9f7140eb 100755 --- a/intaro.intarocrm/classes/general/ICrmOrderActions.php +++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php @@ -256,6 +256,11 @@ class ICrmOrderActions break; case 'ADDRESS': $resOrderDeliveryAddress['text'] = self::toJSON($ar['VALUE']); break; + case 'LOCATION': if(!isset($resOrderDeliveryAddress['city']) && !$resOrderDeliveryAddress['city']) { + $resOrderDeliveryAddress['city'] = CSaleLocation::GetByID($ar['VALUE']); + $resOrderDeliveryAddress['city'] = self::toJSON($resOrderDeliveryAddress['city']['CITY_NAME_LANG']); + } + break; case 'FIO': $resOrder['contactName'] = explode(" ", self::toJSON($ar['VALUE'])); break; case 'PHONE': $resOrder['phone'] = $ar['VALUE']; diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php~ b/intaro.intarocrm/classes/general/ICrmOrderActions.php~ new file mode 100755 index 00000000..7fde6192 --- /dev/null +++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php~ @@ -0,0 +1,372 @@ + "ASC"), array('>ID' => $lastUpOrderId)); + + $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); + + $arParams = array( + 'optionsOrderTypes' => $optionsOrderTypes, + 'optionsDelivTypes' => $optionsDelivTypes, + 'optionsPayTypes' => $optionsPayTypes, + 'optionsPayStatuses' => $optionsPayStatuses, + 'optionsPayment' => $optionsPayment + ); + + // pack mode enable / disable + // can send data evry 500 rows + if (!$steps) { + + while ($arOrder = $dbOrder->GetNext()) { //here orders by id asc; with offset + + $order = self::orderCreate($arOrder['ID'], $api, $arParams); + + if (!$order) + continue; + + $resOrders[] = $order; + + $lastOrderId = $arOrder['ID']; + } + + if (!empty($resOrders)) { + $orders = $api->orderUpload($resOrders); + + // error pushing orders + if ($api->getStatusCode() != 201) { + //handle err + self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError()); + + if ($api->getStatusCode() != 460) // some orders were sent + return true; + } + } + + } else { // package mode (by default runs after install) + $orderCount = 0; + + while ($arOrder = $dbOrder->GetNext()) { // here orders by id asc + + $order = self::orderCreate($arOrder['ID'], $api, $arParams); + + if (!$order) + continue; + + $orderCount++; + + $resOrders[] = $order; + + $lastOrderId = $arOrder['ID']; + + if($orderCount >= $pSize) { + $orders = $api->orderUpload($resOrders); + + // error pushing orders + if ($api->getStatusCode() != 201) { + //handle err + self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError()); + + if($api->getStatusCode() != 460) // some orders were sent + return false; // in pack mode return errors + + if($lastOrderId) + COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId); + } + + return true; // end of pack + } + } + + if (!empty($resOrders)) { + $orders = $api->orderUpload($resOrders); + + // error pushing orders + if ($api->getStatusCode() != 201) { + //handle err + self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError()); + + if ($api->getStatusCode() != 460) // some orders were sent + return false; // in pack mode return errors + } + } + } + + if($lastOrderId) + COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId); + + return true; //all ok! + } + + /** + * + * w+ event in bitrix log + */ + private static function eventLog($auditType, $itemId, $description) { + CEventLog::Add(array( + "SEVERITY" => "SECURITY", + "AUDIT_TYPE_ID" => $auditType, + "MODULE_ID" => self::$MODULE_ID, + "ITEM_ID" => $itemId, + "DESCRIPTION" => $description, + )); + } + + /** + * + * Agent function + * + * @return self name + */ + + public static function uploadOrdersAgent() { + + if(self::uploadOrders()) + return 'ICrmOrderActions::uploadOrdersAgent();'; + + else return; + } + + public static function orderCreate($orderId, $api, $arParams, $send = false) { + if(!$api || empty($arParams) || !$orderId) { // add cond to check $arParams + return false; + } + + $arFields = CSaleOrder::GetById($orderId); + + if (empty($arFields)) { + //handle err + self::eventLog('ICrmOrderActions::orderCreate', 'empty($arFields)', 'incorrect order'); + + return false; + } + + $rsUser = CUser::GetByID($arFields['USER_ID']); + $arUser = $rsUser->Fetch(); + + $createdAt = new \DateTime($arUser['DATE_REGISTER']); + $createdAt = $createdAt->format('Y-m-d H:i:s'); + + // 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; + + $result = self::clearArr(array( + 'externalId' => $arFields['USER_ID'], + 'lastName' => $lastName, + 'firstName' => $firstName, + 'patronymic' => $patronymic, + 'phones' => $phones, + 'createdAt' => $createdAt + )); + + $customer = $api->customerEdit($result); + + // error pushing customer + if (!$customer) { + //handle err + self::eventLog('ICrmOrderActions::orderCreate', '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'] = explode(" ", self::toJSON($ar['VALUE'])); + break; + case 'PHONE': $resOrder['phone'] = $ar['VALUE']; + break; + case 'EMAIL': $resOrder['email'] = $ar['VALUE']; + break; + } + } + + $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 = ''; + + if($p['DISCOUNT_VALUE']) + $p['DISCOUNT_PRICE'] = null; + + $items[] = array( + 'initialPrice' => (double) $p['PRICE'] + (double) $p['DISCOUNT_PRICE'], + 'purchasePrice' => $pr, + 'discount' => $p['DISCOUNT_PRICE'], + 'discountPercent' => $p['DISCOUNT_VALUE'], + 'quantity' => $p['QUANTITY'], + 'productId' => $p['PRODUCT_ID'], + 'productName' => self::toJSON($p['NAME']) + ); + } + + if($arFields['CANCELED'] == 'Y') + $arFields['STATUS_ID'] = $arFields['CANCELED']; + + $createdAt = new \DateTime($arFields['DATE_INSERT']); + $createdAt = $createdAt->format('Y-m-d H:i:s'); + + $resOrder = self::clearArr(array( + 'firstName' => $resOrder['contactName'][0], + 'lastName' => $resOrder['contactName'][1], + 'patronymic' => $resOrder['contactName'][2], + 'phone' => $resOrder['phone'], + 'email' => $resOrder['email'], + 'deliveryCost' => $arFields['PRICE_DELIVERY'], + 'summ' => $arFields['PRICE'], + 'markDateTime' => $arFields['DATE_MARKED'], + 'externalId' => $arFields['ID'], + 'customerId' => $arFields['USER_ID'], + 'paymentType' => $arParams['optionsPayTypes'][$arFields['PAY_SYSTEM_ID']], + 'paymentStatus' => $arParams['optionsPayment'][$arFields['PAYED']], + 'orderType' => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']], + 'deliveryType' => $arParams['optionsDelivTypes'][$resultDeliveryTypeId], + 'status' => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']], + 'statusComment' => $arFields['REASON_CANCELED'], + 'createdAt' => $createdAt, + 'deliveryAddress' => $resOrderDeliveryAddress, + 'items' => $items + )); + + if($send) + return $api->createOrder($resOrder); + + return $resOrder; + + } + + /** + * removes all empty fields from arrays + * working with nested arrs + * + * @param type $arr + * @return boolean + */ + public static function clearArr($arr) { + if(!$arr || !is_array($arr)) + return false; + + foreach($arr as $key => $value) { + if(!$value || (is_array($value) && empty($value))) + unset($arr[$key]); + + if(is_array($value) && !empty($value)) + $arr[$key] = self::clearArr($value); + } + + return $arr; + } + + /** + * + * @global type $APPLICATION + * @param type $str in SITE_CHARSET + * @return type $str in utf-8 + */ + protected static function toJSON($str) { + global $APPLICATION; + + return $APPLICATION->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); + } +}