From 20a4b3cd34bfffd2b99a1b2864f1307209451317 Mon Sep 17 00:00:00 2001 From: fomichev Date: Mon, 31 Mar 2025 14:37:01 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4=D1=83?= =?utf8?q?=D0=B1=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?utf8?q?=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MarketplaceService.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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; -- 2.39.5