From 960e84d6f7f65ff1224acd88656ea87ea2eae7e5 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 8 Nov 2024 09:08:06 +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 --- .../actions/marketplace/InfoAboutStocksAndPrice.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/erp24/actions/marketplace/InfoAboutStocksAndPrice.php b/erp24/actions/marketplace/InfoAboutStocksAndPrice.php index ed46ff97..f6ca73c7 100644 --- a/erp24/actions/marketplace/InfoAboutStocksAndPrice.php +++ b/erp24/actions/marketplace/InfoAboutStocksAndPrice.php @@ -4,6 +4,7 @@ namespace yii_app\actions\marketplace; use yii\base\Action; use yii\helpers\ArrayHelper; +use yii\helpers\Json; use yii_app\records\Balances; use yii_app\records\MarketplacePriority; use yii_app\records\MarketplaceStore; @@ -121,14 +122,7 @@ class InfoAboutStocksAndPrice extends Action continue; } - if ($effectiveStock >= 2) { - // Если остаток позволяет, добавляем в доступные - $availableGuids[] = array('guid' => $guid, 'count' => $stock['count'], 'price' => $price, 'store' => $stock['store']); - } elseif ($effectiveStock == 1 && $minQuanity == 1) { - // Если минимальный остаток 1, добавляем в доступные - $availableGuids[] = array('guid' => $guid, 'count' => $stock['count'], 'price' => $price, 'store' => $stock['store']); - } elseif ($effectiveStock > 1) { - // Нечётное количество, добавляем в доступные + if (($effectiveStock >= $minQuanity)) { $availableGuids[] = array('guid' => $guid, 'count' => $stock['count'], 'price' => $price, 'store' => $stock['store']);// Добав// Добавляем GUID } @@ -174,6 +168,6 @@ class InfoAboutStocksAndPrice extends Action } } - return $availableGuids; + return Json::decode($availableGuids); } } -- 2.39.5