Сохранение

diff --git a/erp24/controllers/MatrixBouquetActualityController.php b/erp24/controllers/MatrixBouquetActualityController.php
index d61004518b1c490b8b9b61c7c65a79be86421f8b..c4788a466dff1a24c3ad99e26c44b922b1a1e6f5 100644 (file)
--- 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 74c85e05250afce4c42f79c94eda39556abbc7e0..a15aee1eee1e16269c9b810fc58b87ea95da3165 100644 (file)
--- a/erp24/views/matrix-bouquet-actuality/index.php
+++ b/erp24/views/matrix-bouquet-actuality/index.php
@@ -237,7 +237,8 @@ foreach ($subgroups as $sg) {
                         <i class="fa fa-times"></i>
                     </div>' : '';
                     $inputs = '<div class="d-flex justify-content-center align-items-center">';
-                    $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);
                     }