ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 31517c928929cde4fbf664954f5b64428057fa06..bf3e0304f6c5e31ae3acd4c19349140499585636 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -22,13 +22,13 @@ class MarketplaceService
 
         // 1. Получение гуидов букетов
         $productsGroup = ProductsClass::find()
-            ->orWhere(['ilike', 'tip', ProductsClass::MARKETPLACE])
-            ->orWhere(['ilike', 'tip', ProductsClass::MARKETPLACE_ADDITIONAL])
+            ->where(['tip' => [ProductsClass::MARKETPLACE, ProductsClass::MARKETPLACE_ADDITIONAL]])
             ->select('category_id')
-            ->asArray();
+            ->asArray()
+            ->column();
 
         $productsGuids = Products1c::find()
-            ->andWhere(['in', 'parent_id', $productsGroup])
+            ->where(['in', 'parent_id', $productsGroup])
             ->andWhere(['<>', 'components', ''])
             ->select('id')
             ->column();
@@ -73,6 +73,7 @@ class MarketplaceService
                 }
             }
 
+
             $bouquetCount = PHP_INT_MAX;
             foreach ($stockRecords as $productGuid => $values) {
                 $temp = intval($values['count'] / $products->$productGuid);
@@ -80,7 +81,7 @@ class MarketplaceService
                 $store = $values['marketplace_guid'];
             }
 
-            if (isset($bouquetCount) && $bouquetCount > 0) {
+            if (!empty($stockRecords) && isset($store) && $bouquetCount > 0) {
                 $stocks[$guid] = ['count' => $bouquetCount, 'store' => $store];
             }
         }