Оставляем в фиде активные товары

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 34c00bac032b9577cdb5918bbb42fd0281ebada6..52d816400ac7344dfc812b8b956a2f10edb2a7e5 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -29,6 +29,7 @@ use yii_app\records\MarketplaceOrderStatusHistory;
 use yii_app\records\MarketplaceOrderStatusTypes;
 use yii_app\records\MarketplacePriority;
 use yii_app\records\MarketplaceStore;
+use yii_app\records\MatrixErp;
 use yii_app\records\MatrixErpMedia;
 use yii_app\records\MatrixErpProperty;
 use yii_app\records\Prices;
@@ -420,8 +421,24 @@ class MarketplaceService
 
         $productQuantities = $storeData[$storeGuid];
 
+        // Сначала получаем активные товары из MatrixErp с is_feed_active = 1
+        $activeMatrixProducts = MatrixErp::find()
+            ->where(['group_name' => 'marketplace'])
+            ->andWhere(['active' => 1])
+            ->andWhere(['is_feed_active' => 1])
+            ->all();
+
+        // Извлекаем GUID'ы активных товаров
+        $activeProductGuids = array_map(function($matrixProduct) {
+            return $matrixProduct->guid;
+        }, $activeMatrixProducts);
+
+        // Находим товары в Products1c только по активным GUID'ам из MatrixErp
+        // и которые есть на складе
+        $availableProductGuids = array_intersect($activeProductGuids, array_keys($productQuantities));
+
         $products = Products1c::find()
-            ->where(['id' => array_keys($productQuantities)])
+            ->where(['id' => $availableProductGuids])
             ->andWhere(['!=', 'components', ''])
             ->all();