From 83121c45185a43b2454e4379500b488bbca3d425 Mon Sep 17 00:00:00 2001 From: gorokh Date: Fri, 26 Jul 2019 17:44:37 +0300 Subject: [PATCH] fix order double create --- CHANGELOG.md | 3 +++ intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php | 2 +- intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c05f208f..074a9143 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2019-07-26 v.2.5.0 +* Исправление создание дублей заказов + ## 2019-07-18 v.2.4.9 * Добавлен поиск города по почтовому индексу при выгрузке истории изменений diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php index 15e88449..1f7ce7ba 100644 --- a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php +++ b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php @@ -205,7 +205,7 @@ class RetailCrmOrder 'amount' => $payment['SUM'] ); if (!empty($payment['ID'])) { - $pm['externalId'] = RCrmActions::generatePaymentExternalId($payment['ID']); + $pm['externalId'] = $payment['ID']; } if (!empty($payment['DATE_PAID'])) { $pm['paidAt'] = new \DateTime($payment['DATE_PAID']); diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index ff95ebd8..22f353ae 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Добавлен поиск города по почтовому индексу при выгрузке истории изменений +- Исправление создание дублей заказов diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 59301bc4..9661cc59 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,5 +1,5 @@ "2.4.9", - "VERSION_DATE" => "2019-07-18 12:26:00" + "VERSION" => "2.5.0", + "VERSION_DATE" => "2019-07-26 17:40:00" );