Вывод статусов

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 8ceb151abb5168fc9773635afd4aac6baa34794e..800ec6d4d28eba3c034c11c4bac426daf2a7994b 100644 (file)
--- 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');
             }