From 8ce4f5d6c672f51f6cd43cd3409e0cfcc5a1d85c Mon Sep 17 00:00:00 2001 From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:40:10 +0300 Subject: [PATCH] =?UTF-8?q?ref=20#89535=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=87=D0=B8=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D1=80=D0=B7=D0=B8=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=80=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D0=BA=D0=BB=D0=B8?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20(#310)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ .../classes/general/RCrmActions.php | 13 ++++++++++- .../classes/general/events/RetailCrmEvent.php | 8 ++++++- .../general/order/RetailCrmOrder_v5.php | 22 ++++++++++++++++--- intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b505f95..1fccab1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2023-08-23 v.6.4.2 +- Исправлена ошибка создания заказов для корпоративных клиентов при использовании функционала брошенных корзин + ## 2023-08-22 v.6.4.1 - Исправлена передача даты регистрации клиента diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php index 8b45346a..b7c6249a 100644 --- a/intaro.retailcrm/classes/general/RCrmActions.php +++ b/intaro.retailcrm/classes/general/RCrmActions.php @@ -546,13 +546,24 @@ class RCrmActions 'errors' => !empty($result['errors']) ? $result['errors'] : '', 'params' => $params ), 'uploadApiErrors'); + } elseif ($methodApi == 'cartGet') { + Logger::getInstance()->write( + [ + 'api' => $version, + 'methodApi' => $methodApi, + 'errorMsg' => !empty($result['errorMsg']) ? $result['errorMsg'] : '', + 'errors' => !empty($result['errors']) ? $result['errors'] : '', + 'params' => $params, + ], + 'apiErrors' + ); } else { - self::eventLog( __CLASS__ . '::' . $method, 'RetailCrm\ApiClient::' . $methodApi, !empty($result['errorMsg']) ? $result['errorMsg'] : '' ); + Logger::getInstance()->write(array( 'api' => $version, 'methodApi' => $methodApi, diff --git a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php index 87b24255..e4653199 100644 --- a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php +++ b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php @@ -109,8 +109,14 @@ class RetailCrmEvent * * @param object $event */ - public static function onChangeBasket($event) + public static function onChangeBasket($event) { + $apiVersion = COption::GetOptionString(self::$MODULE_ID, 'api_version', 0); + + if ($apiVersion !== 'v5') { + return; + } + $id = \Bitrix\Main\Engine\CurrentUser::get()->getId(); if ($id) { diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php index 05525ec4..343214ea 100644 --- a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php +++ b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php @@ -17,6 +17,7 @@ use Intaro\RetailCrm\Service\LoyaltyAccountService; use RetailCrm\Response\ApiResponse; use \Bitrix\Sale\Location\Name\LocationTable as LocationTableName; use Intaro\RetailCrm\Component\ConfigProvider; +use Intaro\RetailCrm\Model\Api\Response\OrdersCreateResponse; IncludeModuleLangFile(__FILE__); @@ -439,12 +440,27 @@ class RetailCrmOrder } $crmBasket = RCrmActions::apiMethod($api, 'cartGet', __METHOD__, $externalId, $site); + $orderResponse = $client->createOrder($order, $site); - if (!empty($crmBasket['cart'])) { - $order['isFromCart'] = true; + if (!empty($crmBasket['cart']) && $orderResponse instanceof OrdersCreateResponse && !empty($orderResponse->id) ) { + RCrmActions::apiMethod( + $api, + 'cartClear', + __METHOD__, + [ + 'clearedAt' => date('Y-m-d H:i:sP'), + 'customer' => [ + 'externalId' => $externalId + ], + 'order' => [ + 'id' => $orderResponse->id + ] + ], + $site + ); } - return $client->createOrder($order, $site); + return $orderResponse; } if ($methodApi === 'ordersEdit') { diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index ec98d01d..53e15a03 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена передача даты регистрации клиента \ No newline at end of file +- Исправлена ошибка создания заказов для корпоративных клиентов при использовании функционала брошенных корзин diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index f76c8911..5c2eee18 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.4.1', - 'VERSION_DATE' => '2023-08-22 9:30:00' + 'VERSION' => '6.4.2', + 'VERSION_DATE' => '2023-08-23 12:30:00' ];