From b9807b4c4cf83fdf55d9ce65d0784779ddf68fa7 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 1 Jul 2025 16:34:25 +0300 Subject: [PATCH] =?utf8?q?ERP-433=20=D0=9E=D1=82=D1=87=D0=B5=D1=82=20?= =?utf8?q?=D0=BF=D0=BE=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B0=D0=BC?= =?utf8?q?=20=D0=B1=D1=83=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB?= =?utf8?q?=D1=8F=20=D0=9C=D0=9F=20=D0=B8=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8?= =?utf8?q?=D0=BD=D0=B0=D0=BC,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BB=D0=BE?= =?utf8?q?=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE?= =?utf8?q?=D1=85=D0=BE=D0=B4=D0=B8=D1=82.=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE?= =?utf8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=80=D1=83=D1=87=D0=BD?= =?utf8?q?=D0=BE=D0=B9=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?= =?utf8?q?=20=D0=B8=D0=B7=20ERP=20=D0=B2=20Excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/marketplace/ReportAction.php | 4 ++-- erp24/services/MarketplaceService.php | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/erp24/actions/marketplace/ReportAction.php b/erp24/actions/marketplace/ReportAction.php index 1ae811e7..7e9ffd98 100644 --- a/erp24/actions/marketplace/ReportAction.php +++ b/erp24/actions/marketplace/ReportAction.php @@ -26,6 +26,7 @@ class ReportAction extends Action $productsRaw = Products1c::find() ->where(['in', 'parent_id', $subQuery]) + ->limit(10) ->all(); $marketplaceService = new MarketplaceService(); @@ -33,7 +34,7 @@ class ReportAction extends Action $products = []; foreach ($productsRaw as $product) { - $check = $marketplaceService->checkProducts($product); + $check = $marketplaceService->checkProducts($product, true); $products[] = [ 'id' => $product->id, 'name' => $product->name, @@ -42,7 +43,6 @@ class ReportAction extends Action ]; } - $dataProvider = new ArrayDataProvider([ 'allModels' => $products, 'pagination' => ['pageSize' => 20], diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index a7d5b795..e309da99 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -473,21 +473,26 @@ class MarketplaceService return $result; } - - public function checkProducts($product): array|false { + + public function checkProducts($product, $isView = false): array|false + { $properties = MarketplaceService::getProductPropertiesByGuid($product->id); if (!$properties) { - $message = "Товар с GUID {$product->id} не имеет свойств в MatrixErpProperty и был исключен из фида."; - Yii::error($message, __METHOD__); - InfoLogService::setInfoLog(__FILE__, __LINE__, $message, 'Missing properties error'); + if ($isView) { + $message = "Товар с GUID {$product->id} не имеет свойств в MatrixErpProperty и был исключен из фида."; + Yii::error($message, __METHOD__); + InfoLogService::setInfoLog(__FILE__, __LINE__, $message, 'Missing properties error'); + } return false; } $price = MarketplaceService::getProductPrice($product->id); if ($price == 0) { - $message = "У товара {$product->id} отсутствует цена и он будет исключен из фида."; - Yii::error($message, __METHOD__); - InfoLogService::setInfoLog(__FILE__, __LINE__, $message, 'Zero price error'); + if ($isView) { + $message = "У товара {$product->id} отсутствует цена и он будет исключен из фида."; + Yii::error($message, __METHOD__); + InfoLogService::setInfoLog(__FILE__, __LINE__, $message, 'Zero price error'); + } return false; } -- 2.39.5