From 236a9104177bde27498d92b831cb7d2800c0ac01 Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Tue, 9 Sep 2025 17:41:17 +0300 Subject: [PATCH] =?utf8?q?=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/MatrixBouquetActualityController.php | 3 ++- erp24/views/matrix-bouquet-actuality/index.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erp24/controllers/MatrixBouquetActualityController.php b/erp24/controllers/MatrixBouquetActualityController.php index d6100451..c4788a46 100644 --- a/erp24/controllers/MatrixBouquetActualityController.php +++ b/erp24/controllers/MatrixBouquetActualityController.php @@ -320,12 +320,13 @@ class MatrixBouquetActualityController extends Controller $bouquetId = $row['bouquet_id']; + $fromAdj = (clone $fromDate)->modify('-1 second')->format('Y-m-d H:i:s'); $toAdj = (clone $toDate)->modify('+1 second')->format('Y-m-d H:i:s'); /** @var MatrixBouquetActuality[] $hits */ $hits = MatrixBouquetActuality::find() - ->where(['guid' => $guid]) + ->where(['bouquet_id' => $bouquetId]) ->andWhere('date_to >= :fromAdj', [':fromAdj' => $fromAdj]) ->andWhere('date_from <= :toAdj', [':toAdj' => $toAdj]) ->orderBy(['date_from' => SORT_ASC]) diff --git a/erp24/views/matrix-bouquet-actuality/index.php b/erp24/views/matrix-bouquet-actuality/index.php index 74c85e05..a15aee1e 100644 --- a/erp24/views/matrix-bouquet-actuality/index.php +++ b/erp24/views/matrix-bouquet-actuality/index.php @@ -237,7 +237,8 @@ foreach ($subgroups as $sg) { ' : ''; $inputs = '
'; - $inputs .= Html::hiddenInput("actuality[$i][guid]", $product->id); + $inputs .= Html::hiddenInput("actuality[$i][bouquet_id]", $product->id); + $inputs .= Html::hiddenInput("actuality[$i][guid]", $product->guid); if ($actuality) { $inputs .= Html::hiddenInput("actuality[$i][id]", $actuality->id); } -- 2.39.5