From 270e9bdcc6377bed0e6f76a1afeaca171a317d07 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Fri, 8 Nov 2024 17:43:39 +0300
Subject: [PATCH] =?utf8?q?ERP-153=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?utf8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?=
 =?utf8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=B0=20=D0=B8?=
 =?utf8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE?=
 =?utf8?q?=D0=B1=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B0=D1=85=20?=
 =?utf8?q?=D0=B8=20=D1=81=D1=82=D0=BE=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?=
 =?utf8?q?=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/MarketplaceService.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 31517c92..bf3e0304 100644
--- 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];
             }
         }
-- 
2.39.5