From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 31 Mar 2025 11:37:01 +0000 (+0300)
Subject: Убрал дублирование истории
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=20a4b3cd34bfffd2b99a1b2864f1307209451317;p=erp24_rep%2Fyii-erp24%2F.git

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

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index b88ef775..c3608f8b 100644
--- 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;