From 3d5a00ca6aa278b1672c1eb01e856dcf501b6bec Mon Sep 17 00:00:00 2001 From: Grisha Pomadchin Date: Thu, 18 Jul 2013 14:35:33 +0400 Subject: [PATCH] Installer changes; bug fixes. --- .../classes/general/ICrmOrderActions.php~ | 321 ------------------ 1 file changed, 321 deletions(-) delete mode 100755 intaro.intarocrm/classes/general/ICrmOrderActions.php~ diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php~ b/intaro.intarocrm/classes/general/ICrmOrderActions.php~ deleted file mode 100755 index b7e18a4c..00000000 --- a/intaro.intarocrm/classes/general/ICrmOrderActions.php~ +++ /dev/null @@ -1,321 +0,0 @@ -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, without repeating; always returns true, but writes error log - * @return boolean - */ - 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('ICrmOrderActions::uploadOrders', 'iblock', 'module not found'); - return true; - } - - if (!CModule::IncludeModule("sale")) { - //handle err - self::eventLog('ICrmOrderActions::uploadOrders', 'sale', 'module not found'); - return true; - } - - if (!CModule::IncludeModule("catalog")) { - //handle err - self::eventLog('ICrmOrderActions::uploadOrders', 'catalog', 'module not found'); - return true; - } - - $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); - - $arParams = array( - 'optionsOrderTypes' => $optionsOrderTypes, - 'optionsDelivTypes' => $optionsDelivTypes, - 'optionsPayTypes' => $optionsPayTypes, - 'optionsPayStatuses' => $optionsPayStatuses, - 'optionsPayment' => $optionsPayment - ); - - while ($arOrder = $dbOrder->GetNext()) { - if ($arOrder['ID'] <= $lastUpOrderId) //old orders not to upload - break; - - if(!$lastUpOrderIdNew) - $lastUpOrderIdNew = $arOrder['ID']; - - $order = self::orderCreate($arOrder['ID'], $api, $arParams); - - if(!$order) - continue; - - $resOrders[] = $order; - } - - $orders = $api->orderUpload($resOrders); - - // error pushing orders - if(!$orders) { - //handle err - self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError()); - return true; - } - - COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastUpOrderIdNew); - - 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, - )); - - //self::sendEmail($itemId, $description); - } - - /** - * - * send email to admin - */ - 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; - } - - 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(); - - // 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('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'] = 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 = ''; - - $items[] = array( - 'price' => $p['PRICE'], - 'purchasePrice' => $pr, - 'discount' => $p['DISCOUNT_VALUE'], - 'quantity' => $p['QUANTITY'], - 'productId' => $p['PRODUCT_ID'], - 'productName' => self::toJSON($p['NAME']) - ); - } - - $resOrder = array( - 'contactName' => $resOrder['contactName'], - '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']], - 'deliveryAddress' => $resOrderDeliveryAddress, - 'items' => $items - ); - - if($send) - return $api->createOrder($resOrder); - - return $resOrder; - - } - -} -?> -