From 307b99a9f6e9a74e59dbc2f658fae1954b2dcffb Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Tue, 12 Aug 2025 17:28:54 +0300 Subject: [PATCH] =?utf8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D1=82?= =?utf8?q?=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 8ceb151a..800ec6d4 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -3003,6 +3003,20 @@ class DataController extends BaseController ->indexBy('code') ->asArray() ->all(); + $cancelledStatusId = $statuses[MarketplaceOrderStatusTypes::CANSELLED_CODE]['id']; + $readyStatusId = $statuses[MarketplaceOrderStatusTypes::READY_CODE]['id']; + $statuses1cWithCancelledId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() + ->select(['status_id']) + ->where(['order_status_id' => $cancelledStatusId]) + ->asArray() + ->all(), 'status_id'); + $statuses1cToChangeYandexMarketFakeOrderId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() + ->select(['status_id']) + ->where(['order_status_id' => $cancelledStatusId]) + ->orWhere(['order_substatus_id' => $readyStatusId]) + ->andWhere(['marketplace_id' => 2]) + ->asArray() + ->all(), 'status_id'); $statuses = ArrayHelper::map($statuses, 'code', 'id'); $statusCodes = array_unique(array_keys($statuses)); @@ -3028,7 +3042,7 @@ class DataController extends BaseController $substatus = $statusId1C->orderStatus; if ( - in_array($statusId1C->status_id, ['1013', '1010']) && + in_array($statusId1C->status_id, $statuses1cToChangeYandexMarketFakeOrderId) && $marketplaceOrder->marketplace_id == 2 ) { if (!$debug) { @@ -3052,7 +3066,7 @@ class DataController extends BaseController $marketplaceOrder->substatus_id = $substatus->id; } } - if (in_array($statusId1C->status_id, ['1013', '1006'])) { + if (in_array($statusId1C->status_id, $statuses1cWithCancelledId)) { $marketplaceOrder->cancelled_order_source = '1c'; $marketplaceOrder->cancelled_order_date = date('Y-m-d H:m:s'); } -- 2.39.5