From 1a42da59ce5433b03c485b4610cd25bda870aaf3 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 3 Sep 2025 11:36:28 +0300
Subject: [PATCH] =?utf8?q?=D0=9D=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8F=D1=82?=
 =?utf8?q?=D1=8C=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=20=D0=BE=D1=82?=
 =?utf8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B7=D0=B0?=
 =?utf8?q?=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=B2=20ERp=20=D0=B8=D0=B7=201?=
 =?utf8?q?C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 5ae91dda..28a225a6 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -3073,25 +3073,27 @@ class DataController extends BaseController
             $result['status'] = null;
             return $result;
         }
+        // статусы маркетплейса
+        $statuses = MarketplaceOrderStatusTypes::find()
+            ->select(['id', 'code'])
+            ->indexBy('code')
+            ->asArray()
+            ->all();
+        $cancelledStatusId = $statuses[MarketplaceOrderStatusTypes::CANSELLED_CODE]['id'];
+        $readyStatusId = $statuses[MarketplaceOrderStatusTypes::READY_CODE]['id'];
+        $status = $mpOrder['status'];
+        $marketplaceOrder = MarketplaceOrders::find()
+            ->where(['guid' => $mpOrder['id']])
+            ->andWhere(['<>', 'status_id', $cancelledStatusId])
+            ->one();
 
-        $marketplaceOrder = MarketplaceOrders::findOne(['guid' => $mpOrder['id']]);
         if ($marketplaceOrder) {
-            $status = $mpOrder['status'];
-
             /** @var $marketplaceOrder MarketplaceOrders */
             $debug = false;
             if ($marketplaceOrder->fake == 1) {
                 $debug = true;
             }
 
-            // статусы маркетплейса
-            $statuses = MarketplaceOrderStatusTypes::find()
-                ->select(['id', 'code'])
-                ->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])
-- 
2.39.5