From d0fa82837a803abc447a49362d3c983bbcc0c381 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Wed, 19 Feb 2025 15:26:34 +0300
Subject: [PATCH] =?utf8?q?ERP-302=20=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?=
 =?utf8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D1=83?=
 =?utf8?q?=D0=BA=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/BouquetController.php |  9 ++++----
 erp24/views/bouquet/_form.php           | 30 +++++++++++++------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index d7015e4a..2a67a63d 100644
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -231,7 +231,7 @@ class BouquetController extends Controller
 
         if (Yii::$app->request->isPost) {
             try {
-                if (array_key_exists('products_quantity', Yii::$app->request->post())) {
+                if (Yii::$app->request->post('products_quantity')) {
                     $bouquetProducts = Yii::$app->request->post('products_quantity');
                     foreach ($bouquetProducts as $key => $value) {
                         $product = new BouquetCompositionProducts([
@@ -242,14 +242,13 @@ class BouquetController extends Controller
                         $product->save();
                     }
 
-                    return $this->redirect('view', [
-                        'model' => $model
-                    ]);
+                    return $this->redirect(['view', 'id' => $id]);
                 }
             } catch (Exception $exception) {
-                throw new NotFoundHttpException($exception);
+                throw new NotFoundHttpException($exception->getMessage());
             }
         }
+
         $products = BouquetCompositionProducts::find()
             ->where(['bouquet_id' => $model->id])
             ->with('product')
diff --git a/erp24/views/bouquet/_form.php b/erp24/views/bouquet/_form.php
index 9cb3cfd8..afeb9b5b 100644
--- a/erp24/views/bouquet/_form.php
+++ b/erp24/views/bouquet/_form.php
@@ -73,7 +73,8 @@ $form = ActiveForm::begin([
 
             <div class="row mt-1 text-center">
                 <div class="col-12">
-                    <a href="<?= Url::to('/matrix-type') ?>" class="text-decoration-none" target="_blank">Редактировать</a>
+                    <a href="<?= Url::to('/matrix-type') ?>" class="text-decoration-none"
+                       target="_blank">Редактировать</a>
                 </div>
             </div>
         </div>
@@ -89,7 +90,7 @@ $form = ActiveForm::begin([
                 <div class="col-md-2 text-center font-weight-bold">ср.шт. в сборке</div>
             </div>
 
-            <div class="row bg-white border rounded shadow-sm" style="height: 400px">
+            <div class="row bg-white border rounded shadow-sm" style="height: 400px; overflow-y: auto; overflow-x: hidden;">
                 <?php foreach ($bouquetCompositionProducts as $product) { ?>
                     <div class="row border-bottom ms-1 py-2">
                         <div class="col-md-4 text-center"><?= $product->product->name ?></div>
@@ -101,20 +102,21 @@ $form = ActiveForm::begin([
                     </div>
                 <?php } ?>
             </div>
-            <div class="row pt-3">
-                <div class="col-md-8">
-                    <strong>Нижегородская область</strong>
-                    <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
-
-                        Себестоимость: <?= $model->getSelfCost()?> <br>
-                        Наценка: <?=$model->getMarkUp() ?> <br>
-                        Цена: <?= $model->getCost() ?><br>
+            <?php if (!empty($model)): ?>
+                <div class="row pt-3">
+                    <div class="col-md-8">
+                        <strong>Нижегородская область</strong>
+                        <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
+                            Себестоимость: <?= $model->getSelfCost() ?> <br>
+                            Наценка: <?= $model->getMarkUp() ?> <br>
+                            Цена: <?= $model->getCost() ?><br>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <?= Html::a('Редактировать',  Url::to("/bouquet/update?id=$model->id"), ['class' => $model ? 'btn btn-warning w-100' : 'btn btn-warning w-100 disabled']) ?>
                     </div>
                 </div>
-                <div class="col-md-4">
-                        <?= Html::a('Редактировать', $model ? Url::to("/bouquet/update?id=$model->id") : Url::to("#"), ['class' => $model ? 'btn btn-warning w-100' : 'btn btn-warning w-100 disabled']) ?>
-                </div>
-            </div>
+            <?php endif; ?>
         </div>
         <div class="col-md-5">
             <div class="row w-100 w-md-75 w-lg-50">
-- 
2.39.5