From: Vladimir Fomichev Date: Mon, 13 Oct 2025 14:30:14 +0000 (+0300) Subject: Замена константы X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=85ffdd53c0821b06c6206b0036116e60351bdf5e;p=erp24_rep%2Fyii-erp24%2F.git Замена константы --- diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index a205bffc..8af66854 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -1369,7 +1369,7 @@ class MarketplaceService if ($cancelledStatusId) { $status1cWithCancelledId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() ->where(['order_status_id' => $cancelledStatusId]) - ->andWhere(['marketplace_id' => 2]) + ->andWhere(['marketplace_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID]) ->asArray() ->all(), 'id')[0] ?? null; $marketplaceOrder->cancelled_order_source = 'Yandex Market'; @@ -1591,7 +1591,7 @@ class MarketplaceService if ($cancelledStatusId) { $status1cWithCancelledId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() ->where(['order_status_id' => $cancelledStatusId]) - ->andWhere(['marketplace_id' => 2]) + ->andWhere(['marketplace_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID]) ->asArray() ->all(), 'id')[0] ?? null; $marketplaceOrder->cancelled_order_source = 'Yandex Market'; @@ -2015,12 +2015,12 @@ class MarketplaceService $deliveredStatusId = $statuses['DELIVERED']; $status1cWithCancelledId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() ->where(['order_status_id' => $cancelledStatusId]) - ->andWhere(['marketplace_id' => 1]) + ->andWhere(['marketplace_id' => MarketplaceStore::FLOWWOW_WAREHOUSE_ID]) ->asArray() ->all(), 'id')[0] ?? null; $status1cWithDeliveredId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find() ->where(['order_status_id' => $deliveredStatusId]) - ->andWhere(['marketplace_id' => 1]) + ->andWhere(['marketplace_id' => MarketplaceStore::FLOWWOW_WAREHOUSE_ID]) ->asArray() ->all(), 'id')[0] ?? null; $order = self::getOrdersDataFromMessage($message);