Убрал дублирование истории

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index b88ef775e1f12a5d875b216763e0d31f48c45d75..c3608f8be58b45103ac2399f7aee263c39aeb6ff 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2028,9 +2028,15 @@ class MarketplaceService
             }
 
         } else {
+            $deliveredStatusCodeId = MarketplaceOrderStatusTypes::find()
+                ->where(['code' => "DELIVERED"])
+                ->one()->id;
+            $deliveredSubstatusCodeId = MarketplaceOrderStatusTypes::find()
+                ->where(['code' => "DELIVERY_SERVICE_DELIVERED"])
+                ->one()->id;
             if (
-                ($statusHistoryRecord->status_id !== (int)$statusId ||
-                $statusHistoryRecord->substatus_id !== (int)$substatusId) ||
+                (($statusHistoryRecord->status_id !== (int)$statusId && $statusHistoryRecord->status_id !== $deliveredStatusCodeId) ||
+                    ($statusHistoryRecord->substatus_id !== (int)$substatusId && $statusHistoryRecord->substatus_id !== $deliveredSubstatusCodeId)) ||
                 (strtotime($order['date']) > strtotime($statusHistoryRecord->date_from))
                 ) {
                 $statusHistoryRecord->active = 0;