From 0557b573a39f8bb4d42576c6a5871c79a72ec19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Fri, 22 Sep 2017 15:28:19 +0300 Subject: [PATCH] v.2.2.5 (#30) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Теперь учитываются группы доставки * Изменен алгоритм передачи оплат * Исправлено задваивание количества товаров в отгрузке * Небольшие исправления --- CHANGELOG.md | 6 ++ .../classes/general/RCrmActions.php | 9 ++- .../classes/general/config/retailcrm.json | 8 ++- .../general/history/RetailCrmHistory_v4.php | 53 ++++++++++-------- .../general/history/RetailCrmHistory_v5.php | 56 +++++++++++-------- .../general/order/RetailCrmOrder_v4.php | 8 ++- .../general/order/RetailCrmOrder_v5.php | 49 +++++++++++----- .../classes/general/user/RetailCrmUser.php | 4 +- intaro.retailcrm/description.ru | 6 +- intaro.retailcrm/install/version.php | 4 +- 10 files changed, 129 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e6fd1cf..36c5816c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2017-09-22 v.2.2.5 +* Теперь учитываются группы доставки +* Изменен алгоритм передачи оплат +* Исправлено задваивание количества товаров в отгрузке +* Небольшие исправления + ## 2017-09-07 v.2.2.4 * Исправлена работа истории пользователей * Убраны события для старого API diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php index a4bd509e..8263308e 100644 --- a/intaro.retailcrm/classes/general/RCrmActions.php +++ b/intaro.retailcrm/classes/general/RCrmActions.php @@ -53,12 +53,15 @@ class RCrmActions in_array($arDeliveryService['PARENT_ID'], $groups)) && $arDeliveryService['ID'] != $noOrderId && $arDeliveryService['CLASS_NAME'] != '\Bitrix\Sale\Delivery\Services\Group') { + if (in_array($arDeliveryService['PARENT_ID'], $groups)) { + $arDeliveryService['PARENT_ID'] = 0; + } $bitrixDeliveryTypesList[] = $arDeliveryService; } } - + return $bitrixDeliveryTypesList; - } + } public static function PaymentList() { @@ -78,7 +81,7 @@ class RCrmActions { $bitrixPaymentStatusesList = array(); $obStatuses = \Bitrix\Sale\Internals\StatusTable::getList(array( - 'filter' => array('TYPE' => 'O'), + 'filter' => array('TYPE' => 'O', '=Bitrix\Sale\Internals\StatusLangTable:STATUS.LID' => LANGUAGE_ID), 'select' => array('ID', "NAME" => 'Bitrix\Sale\Internals\StatusLangTable:STATUS.NAME') )); while ($arStatus = $obStatuses->fetch()) { diff --git a/intaro.retailcrm/classes/general/config/retailcrm.json b/intaro.retailcrm/classes/general/config/retailcrm.json index acdad710..f0064282 100644 --- a/intaro.retailcrm/classes/general/config/retailcrm.json +++ b/intaro.retailcrm/classes/general/config/retailcrm.json @@ -135,7 +135,13 @@ }, "browserId": { "type": "string" - } + }, + "discountCardNumber": { + "type": "string" + }, + "personalDiscount": { + "type": "string" + } }, "orders": { "number": { diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php index 6c9546db..35db0eae 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php @@ -371,7 +371,7 @@ class RetailCrmHistory $order['customer']['externalId'] = $registeredUserID; } - if (isset($optionsSitesList)) { + if ($optionsSitesList) { $site = array_search($order['site'], $optionsSitesList); } else { $site = CSite::GetDefSite(); @@ -426,9 +426,9 @@ class RetailCrmHistory 'filter' => array('ACCOUNT_NUMBER' => $order['number']), 'select' => array('ID'), ); - $searchOrder = reset(Bitrix\Sale\Order::loadByFilter($searchFilter)); + $searchOrder = \Bitrix\Sale\OrderTable::GetList($searchFilter)->fetch(); if (!empty($searchOrder)) { - if ($searchOrder->getId() != $order['externalId']) { + if ($searchOrder['ID'] != $order['externalId']) { RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'setField("ACCOUNT_NUMBER")', 'Error order load id=' . $order['externalId']) . '. Number ' . $order['number'] . ' already exists'; continue; @@ -439,25 +439,26 @@ class RetailCrmHistory } $personType = $newOrder->getField('PERSON_TYPE_ID'); - - $nType = array(); - $tList = RCrmActions::OrderTypesList(array(array('LID' => $site))); - foreach($tList as $type){ - if (isset($optionsOrderTypes[$type['ID']])) { - $nType[$optionsOrderTypes[$type['ID']]] = $type['ID']; + if (isset($order['orderType']) && $order['orderType']) { + $nType = array(); + $tList = RCrmActions::OrderTypesList(array(array('LID' => $site))); + foreach($tList as $type){ + if (isset($optionsOrderTypes[$type['ID']])) { + $nType[$optionsOrderTypes[$type['ID']]] = $type['ID']; + } } - } - $optionsOrderTypes = $nType; - - if ($optionsOrderTypes[$order['orderType']]) { - if ($personType != $optionsOrderTypes[$order['orderType']] && $personType != 0) { - $propsRemove = true; + $newOptionsOrderTypes = $nType; + + if ($newOptionsOrderTypes[$order['orderType']]) { + if ($personType != $newOptionsOrderTypes[$order['orderType']] && $personType != 0) { + $propsRemove = true; + } + $personType = $newOptionsOrderTypes[$order['orderType']]; + $newOrder->setField('PERSON_TYPE_ID', $personType); + } elseif ($personType == 0) { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'orderType not found', 'PERSON_TYPE_ID = 0'); } - $personType = $optionsOrderTypes[$order['orderType']]; - $newOrder->setField('PERSON_TYPE_ID', $personType); - } elseif ($personType == 0) { - RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'orderType not found', 'PERSON_TYPE_ID = 0'); - } + } //status if ($optionsPayStatuses[$order['status']]) { @@ -623,6 +624,8 @@ class RetailCrmHistory } if ($product['delete']) { $item->delete(); + $basket->save(); + continue; } @@ -808,8 +811,10 @@ class RetailCrmHistory $change['order']['items'] = $items; } - if ($change['order']['contragent']['contragentType']) { - $change['order']['contragentType'] = self::newValue($change['order']['contragent']['contragentType']); + if (isset($change['order']['contragent']) && count($change['order']['contragent']) > 0) { + foreach ($change['order']['contragent'] as $name => $value) { + $change['order'][$name] = self::newValue($value); + } unset($change['order']['contragent']); } @@ -833,7 +838,7 @@ class RetailCrmHistory if (empty($change['newValue']) && $change['field'] == 'order_product') { $orders[$change['order']['id']]['items'][$change['item']['id']]['delete'] = 1; } - if (!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && $fields['item'][$change['field']]) { + if (/*!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && */$fields['item'][$change['field']]) { $orders[$change['order']['id']]['items'][$change['item']['id']][$fields['item'][$change['field']]] = $change['newValue']; } } else { @@ -1045,7 +1050,7 @@ class RetailCrmHistory } $obShipments = \Bitrix\Sale\Internals\ShipmentTable::getList(array( - 'filter' => array('ORDER_ID' => $orderId), + 'filter' => array('ORDER_ID' => $orderId, 'SYSTEM' => 'N'), 'select' => array('ID') )); diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index 3c9cfc41..4ffed512 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -440,9 +440,9 @@ class RetailCrmHistory 'filter' => array('ACCOUNT_NUMBER' => $order['number']), 'select' => array('ID'), ); - $searchOrder = reset(Bitrix\Sale\Order::loadByFilter($searchFilter)); + $searchOrder = \Bitrix\Sale\OrderTable::GetList($searchFilter)->fetch(); if (!empty($searchOrder)) { - if ($searchOrder->getId() != $order['externalId']) { + if ($searchOrder['ID'] != $order['externalId']) { RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'setField("ACCOUNT_NUMBER")', 'Error order load id=' . $order['externalId']) . '. Number ' . $order['number'] . ' already exists'; continue; @@ -453,24 +453,25 @@ class RetailCrmHistory } $personType = $newOrder->getField('PERSON_TYPE_ID'); - - $nType = array(); - $tList = RCrmActions::OrderTypesList(array(array('LID' => $site))); - foreach($tList as $type){ - if (isset($optionsOrderTypes[$type['ID']])) { - $nType[$optionsOrderTypes[$type['ID']]] = $type['ID']; + if (isset($order['orderType']) && $order['orderType']) { + $nType = array(); + $tList = RCrmActions::OrderTypesList(array(array('LID' => $site))); + foreach($tList as $type){ + if (isset($optionsOrderTypes[$type['ID']])) { + $nType[$optionsOrderTypes[$type['ID']]] = $type['ID']; + } } - } - $optionsOrderTypes = $nType; + $newOptionsOrderTypes = $nType; - if ($optionsOrderTypes[$order['orderType']]) { - if ($personType != $optionsOrderTypes[$order['orderType']] && $personType != 0) { - $propsRemove = true; + if ($newOptionsOrderTypes[$order['orderType']]) { + if ($personType != $newOptionsOrderTypes[$order['orderType']] && $personType != 0) { + $propsRemove = true; + } + $personType = $newOptionsOrderTypes[$order['orderType']]; + $newOrder->setField('PERSON_TYPE_ID', $personType); + } elseif ($personType == 0) { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'orderType not found', 'PERSON_TYPE_ID = 0'); } - $personType = $optionsOrderTypes[$order['orderType']]; - $newOrder->setField('PERSON_TYPE_ID', $personType); - } elseif ($personType == 0) { - RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'orderType not found', 'PERSON_TYPE_ID = 0'); } //status @@ -628,7 +629,9 @@ class RetailCrmHistory 'PRODUCT_PROVIDER_CLASS' => 'CCatalogProductProvider', 'DIMENSIONS' => $elem['DIMENSIONS'], 'WEIGHT' => $elem['WEIGHT'], - 'NOTES' => GetMessage('PRICE_TYPE') + 'NOTES' => GetMessage('PRICE_TYPE'), + 'PRODUCT_XML_ID' => $elem["XML_ID"], + 'CATALOG_XML_ID' => $elem["IBLOCK_XML_ID"] )); } else { RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'createItem', 'Error item add'); @@ -638,6 +641,7 @@ class RetailCrmHistory } if ($product['delete']) { $item->delete(); + $basket->save(); continue; } @@ -826,9 +830,11 @@ class RetailCrmHistory } $change['order']['payments'] = $payments; } - - if ($change['order']['contragent']['contragentType']) { - $change['order']['contragentType'] = self::newValue($change['order']['contragent']['contragentType']); + + if (isset($change['order']['contragent']) && count($change['order']['contragent']) > 0) { + foreach ($change['order']['contragent'] as $name => $value) { + $change['order'][$name] = self::newValue($value); + } unset($change['order']['contragent']); } @@ -852,7 +858,7 @@ class RetailCrmHistory if (empty($change['newValue']) && $change['field'] == 'order_product') { $orders[$change['order']['id']]['items'][$change['item']['id']]['delete'] = 1; } - if (!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && $fields['item'][$change['field']]) { + if (/*!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && */$fields['item'][$change['field']]) { $orders[$change['order']['id']]['items'][$change['item']['id']][$fields['item'][$change['field']]] = $change['newValue']; } } elseif ($change['payment']) { @@ -1081,7 +1087,7 @@ class RetailCrmHistory } $obShipments = \Bitrix\Sale\Internals\ShipmentTable::getList(array( - 'filter' => array('ORDER_ID' => $orderId), + 'filter' => array('ORDER_ID' => $orderId, 'SYSTEM' => 'N'), 'select' => array('ID') )); @@ -1277,7 +1283,9 @@ class RetailCrmHistory 'HEIGHT' => $catalog['HEIGHT'], 'LENGTH' => $catalog['LENGTH'], ))), - 'WEIGHT' => $catalog['WEIGHT'] + 'WEIGHT' => $catalog['WEIGHT'], + 'XML_ID' => $elementInfo["XML_ID"], + 'IBLOCK_XML_ID' => $elementInfo["IBLOCK_EXTERNAL_ID"] ); return $info; diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v4.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v4.php index de7db1d6..f19cb922 100644 --- a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v4.php +++ b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v4.php @@ -155,7 +155,7 @@ class RetailCrmOrder } $normalizer = new RestNormalizer(); - $order = $normalizer->normalize($order, 'orders'); + $order = $normalizer->normalize($order, 'ordersSend'); $log = new Logger(); $log->write($order, 'order'); @@ -326,6 +326,12 @@ class RetailCrmOrder foreach ($shipmentList as $shipmentData) { if ($shipmentData->getDeliveryId()) { $delivery = \Bitrix\Sale\Delivery\Services\Manager::getById($shipmentData->getDeliveryId()); + $siteDeliverys = RCrmActions::DeliveryList(); + foreach ($siteDeliverys as $siteDelivery) { + if ($siteDelivery['ID'] == $delivery['ID'] && $siteDelivery['PARENT_ID'] == 0) { + unset($delivery['PARENT_ID']); + } + } if ($delivery['PARENT_ID']) { $servise = explode(':', $delivery['CODE']); $shipment = array('id' => $delivery['PARENT_ID'], 'service' => $servise[1]); diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php index 02a2af7d..0b746209 100644 --- a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php +++ b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php @@ -141,20 +141,26 @@ class RetailCrmOrder //payments $payments = array(); foreach ($arFields['PAYMENTS'] as $payment) { - $pm = array( - 'type' => isset($arParams['optionsPayTypes'][$payment['PAY_SYSTEM_ID']]) ? $arParams['optionsPayTypes'][$payment['PAY_SYSTEM_ID']] : '', - 'amount' => $payment['SUM'] - ); - if (!empty($payment['ID'])) { - $pm['externalId'] = $payment['ID']; + if (!empty($payment['PAY_SYSTEM_ID']) && isset($arParams['optionsPayTypes'][$payment['PAY_SYSTEM_ID']])) { + $pm = array( + 'type' => $arParams['optionsPayTypes'][$payment['PAY_SYSTEM_ID']], + 'amount' => $payment['SUM'] + ); + if (!empty($payment['ID'])) { + $pm['externalId'] = $payment['ID']; + } + if (!empty($payment['DATE_PAID'])) { + $pm['paidAt'] = new \DateTime($payment['DATE_PAID']); + } + if (!empty($arParams['optionsPayment'][$payment['PAID']])) { + $pm['status'] = $arParams['optionsPayment'][$payment['PAID']]; + } + $payments[] = $pm; + } else { + RCrmActions::eventLog('RetailCrmOrder::orderSend', 'payments', 'OrderID = ' . $arFields['ID'] . '. Payment not found.'); + + continue; } - if (!empty($payment['DATE_PAID'])) { - $pm['paidAt'] = new \DateTime($payment['DATE_PAID']); - } - if (!empty($arParams['optionsPayment'][$payment['PAID']])) { - $pm['status'] = $arParams['optionsPayment'][$payment['PAID']]; - } - $payments[] = $pm; } if (count($payments) > 0) { $order['payments'] = $payments; @@ -173,7 +179,7 @@ class RetailCrmOrder } $normalizer = new RestNormalizer(); - $order = $normalizer->normalize($order, 'orders'); + $order = $normalizer->normalize($order, 'ordersSend'); $log = new Logger(); $log->write($order, 'order'); @@ -198,7 +204,14 @@ class RetailCrmOrder foreach ($order['payments'] as $payment) { if (isset($crmPayments['externalIds'][$payment['externalId']])) { //update payment - if(RCrmActions::apiMethod($api, 'ordersPaymentEdit', __METHOD__, $payment, $site)){ + if ($payment['type'] == $crmPayments['externalIds'][$payment['externalId']]['type']) { + if (RCrmActions::apiMethod($api, 'ordersPaymentEdit', __METHOD__, $payment, $site)) { + unset($crmPayments['externalIds'][$payment['externalId']]); + } + } else { + RCrmActions::apiMethod($api, 'ordersPaymentDelete', __METHOD__, $crmPayments['externalIds'][$payment['externalId']]['id']); + $payment['order']['externalId'] = $order['externalId']; + RCrmActions::apiMethod($api, 'ordersPaymentCreate', __METHOD__, $payment, $site); unset($crmPayments['externalIds'][$payment['externalId']]); } } else { @@ -395,6 +408,12 @@ class RetailCrmOrder foreach ($shipmentList as $shipmentData) { if ($shipmentData->getDeliveryId()) { $delivery = \Bitrix\Sale\Delivery\Services\Manager::getById($shipmentData->getDeliveryId()); + $siteDeliverys = RCrmActions::DeliveryList(); + foreach ($siteDeliverys as $siteDelivery) { + if ($siteDelivery['ID'] == $delivery['ID'] && $siteDelivery['PARENT_ID'] == 0) { + unset($delivery['PARENT_ID']); + } + } if ($delivery['PARENT_ID']) { $servise = explode(':', $delivery['CODE']); $shipment = array('id' => $delivery['PARENT_ID'], 'service' => $servise[1]); diff --git a/intaro.retailcrm/classes/general/user/RetailCrmUser.php b/intaro.retailcrm/classes/general/user/RetailCrmUser.php index 020ef78c..3082a662 100644 --- a/intaro.retailcrm/classes/general/user/RetailCrmUser.php +++ b/intaro.retailcrm/classes/general/user/RetailCrmUser.php @@ -65,7 +65,7 @@ class RetailCrmUser $customer = $normalizer->normalize($customer, 'customers'); $log = new Logger(); - $log->write($customer, 'customer'); + $log->write($customer, 'customerSend'); if ($send) { if (!RCrmActions::apiMethod($api, 'customersCreate', __METHOD__, $customer, $site)) { @@ -136,7 +136,7 @@ class RetailCrmUser $customer = $normalizer->normalize($customer, 'customers'); $log = new Logger(); - $log->write($customer, 'customer'); + $log->write($customer, 'customerSend'); if (function_exists('retailCrmBeforeCustomerSend')) { $newResCustomer = retailCrmBeforeCustomerSend($customer); diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index f1935ac8..595a8834 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1,2 +1,4 @@ -- Убраны старые обработчики событий -- Исправлена работа истории пользователей +- Теперь учитываются группы доставки +- Изменен алгоритм передачи оплат +- Исправлено задваивание количества товаров в отгрузке +- Небольшие исправления diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 8ccc20f9..bf151eed 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "2.2.4", - "VERSION_DATE" => "2017-09-07 12:00:00" + "VERSION" => "2.2.5", + "VERSION_DATE" => "2017-09-22 18:00:00" );