ref #89248 Исправлена ошибка при изменении торгового предложения в то…

…варе (#299)
retailcrm · Jun 12, 2023 · 7a2ab16 · 7a2ab16
1 parent ce5ea1f
commit 7a2ab16
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-06-12 v.6.3.14
+- Исправлена ошибка при изменении торгового предложения в товаре
+
 ## 2023-06-09 v.6.3.13
 - Правка генерации при работе со значением Без НДС
 

diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
@@ -180,6 +180,7 @@ public static function orderSend(
 
         if ('ordersEdit' === $methodApi) {
             $response = RCrmActions::apiMethod($api, 'ordersGet', __METHOD__, $order['externalId'], $site);
+
             if (isset($response['order'])) {
                 foreach ($response['order']['items'] as $k => $item) {
                     $externalId = $k .'_'. $item['offer']['externalId'];
@@ -223,12 +224,12 @@ public static function orderSend(
                 ) {
                     $externalIds[$keyBasketId] = [
                         'code' => 'bitrixBasketId',
-                        'value' => $product['ID'],
+                        'value' => $product['ID'] . '#' . $externalId,
                     ];
                 } else {
                     $externalIds[] = [
                         'code' => 'bitrixBasketId',
-                        'value' => $product['ID'],
+                        'value' => $product['ID'] . '#' . $externalId,
                     ];
                 }
             } else { //create
@@ -239,7 +240,7 @@ public static function orderSend(
                     ],
                     [
                         'code' => 'bitrixBasketId',
-                        'value' => $product['ID'],
+                        'value' => $product['ID'] . '#' . $externalId,
                     ],
                 ];
             }

diff --git 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
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.13',
-    'VERSION_DATE' => '2023-06-09 15:00:00'
+    'VERSION'      => '6.3.14',
+    'VERSION_DATE' => '2023-06-12 20:00:00'
 ];
diff --git a/intaro.retailcrm/lib/service/orderloyaltydataservice.php b/intaro.retailcrm/lib/service/orderloyaltydataservice.php
@@ -199,7 +199,9 @@ public function updateOrderFromCrm(int $orderId): void
                     array_column($itemArray['externalIds'], 'code'),
                     true
                 );
-                $basketItem = $basket->getItemById($item->externalIds[$basketIdKey]->value);
+
+                $basketId = explode('#', $item->externalIds[$basketIdKey]->value)[0] ?? null;
+                $basketItem = $basket->getItemById($basketId);
 
                 if ($basketItem === null) {
                     continue;