From baf8f3e84cc66eba9cf2dfbc0acf31806eea9a05 Mon Sep 17 00:00:00 2001
From: Sergey Chazov <oitv18@gmail.com>
Date: Thu, 3 Feb 2022 17:04:06 +0400
Subject: [PATCH] restore shipment before deleting

---
 .../classes/general/history/RetailCrmHistory_v5.php           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index 3934cdfa..b9c59a31 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1623,7 +1623,9 @@ class RetailCrmHistory
         $shipmentColl = $order->getShipmentCollection();
 
         if ($delivery) {
-            if (!$update) {
+            //В коллекции всегда есть одна скрытая системная доставка, к которой относятся нераспределенные товары
+            //Поэтому, если есть только системная доставка, то нужно создать новую
+            if (!$update || $shipmentColl->count() === 1) {
                 $shipment = $shipmentColl->createItem($delivery);
                 $shipment->setFields([
                     'BASE_PRICE_DELIVERY'   => $orderCrm['delivery']['cost'],