ERP-302 Редактирование букета

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 32b2dfb0e219999eb6c9a7157af5689f2c2dc37a..502574908f5bd4ff110acd63588019d5813c7b26 100644 (file)
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -27,10 +27,12 @@ class BouquetController extends Controller
 
     public function actionView()
     {
-        $storesTypeList =  ArrayHelper::map(StoreType::find()->all(), 'id', 'name');
+        $storesTypeList =  ArrayHelper::map(StoreType::find()->orderBy('sequence_number')->all(), 'id', 'name');
         $storesList = ArrayHelper::map(CityStore::findAll(['visible' => CityStore::IS_VISIBLE]), 'id', 'name');
+
         return $this->render('view', [
-            'storesList' => $storesList
+            'storesList' => $storesList,
+            'storesTypeList' => $storesTypeList,
         ]);
     }
 

diff --git a/erp24/views/bouquet/view.php b/erp24/views/bouquet/view.php
index 9dc55b1d8bd889fc099a36e838b5227ba7c1508a..59f528d95ef7a7de862791c3be0674d502fbfdc3 100644 (file)
--- a/erp24/views/bouquet/view.php
+++ b/erp24/views/bouquet/view.php
@@ -53,8 +53,8 @@ $this->registerCss("
     </div>
     <div class="row">
         <div class="col-md-4">
-            <div class="row mb-2 pt-3">
-                <div class="col-md-4 fw-bold ps-5">Название</div>
+            <div class="row pt-3 pb-2">
+                <div class="col-md-4 text-center font-weight-bold">Название</div>
                 <div class="col-md-2 text-center font-weight-bold">Кол-во</div>
                 <div class="col-md-1 text-center font-weight-bold">% списания</div>
                 <div class="col-md-2 text-center font-weight-bold">мрж-ть</div>
@@ -62,9 +62,9 @@ $this->registerCss("
                 <div class="col-md-2 text-center font-weight-bold">ср.шт. в сборке</div>
             </div>
 
-            <div class="row p-3 bg-white border rounded shadow-sm">
-                <div class="row">
-                    <div class="col-md-4">Гладиолусы краш</div>
+            <div class="row bg-white border rounded shadow-sm">
+                <div class="row ms-1 py-2">
+                    <div class="col-md-4 text-center">Гладиолусы краш</div>
                     <div class="col-md-2 text-center">3.0</div>
                     <div class="col-md-1 text-center">10%</div>
                     <div class="col-md-2 text-center">30%</div>
@@ -171,14 +171,16 @@ $this->registerCss("
                 <?= Html::label("Оффлайн магазины", null, ['class' => 'text-center font-weight-bold pt-4 h6']) ?>
             </div>
             <div class="row">
-                <div class="container border p-3" style="max-height: 200px; background-color: white; overflow: auto;">
+                <div class="container border p-3" style="max-height: 185px; background-color: white; overflow: auto;">
                     <div class="row align-items-center mb-2">
-                        <div class="col-md-8">
-                            <label class="col-form-label">Поле 1:</label>
-                        </div>
-                        <div class="col-md-4">
-                            <input type="number" class="form-control" placeholder="Введите значение">
-                        </div>
+                        <?php foreach ($storesTypeList as $type) {
+                            echo '<div class="col-md-8">
+                                    <label class="col-form-label">'.$type.'</label>
+                                </div>
+                                <div class="col-md-4">
+                                    <input type="number" class="form-control h-25" placeholder="Введите значение">
+                                </div>';
+                        } ?>
                     </div>
                 </div>
             </div>
@@ -186,14 +188,14 @@ $this->registerCss("
                 <?= Html::label("Интернет магазины", null, ['class' => 'text-center font-weight-bold pt-3 h6']) ?>
             </div>
             <div class="row">
-                <div class="container border p-3" style="max-height: 200px;background-color: white; overflow: auto;">
+                <div class="container border p-3" style="max-height: 185px;background-color: white; overflow: auto;">
                     <div class="row align-items-center mb-2">
                         <?php foreach ($storesList as $store) {
                             echo '<div class="col-md-8">
-                                    <label class="col-form-label">'.$store.':</label>
+                                    <label class="col-form-label">'.$store.'</label>
                                 </div>
                                 <div class="col-md-4">
-                                    <input type="number" class="form-control" placeholder="Введите значение">
+                                    <input type="number" class="form-control h-25" placeholder="Введите значение">
                                 </div>';
                         } ?>
                     </div>
@@ -203,11 +205,11 @@ $this->registerCss("
                 <?= Html::label("Маркетплейсы", null, ['class' => 'text-center font-weight-bold pt-3 h6']) ?>
             </div>
             <div class="row">
-                <div class="container border p-3" style="max-height: 200px; background-color: white; overflow: auto;">
+                <div class="container border p-3" style="max-height: 185px; background-color: white; overflow: auto;">
                     <div class="row align-items-center mb-2">
                         <?php foreach ($storesList as $store) {
                             echo '<div class="col-md-8">
-                                    <label class="col-form-label">'.$store.':</label>
+                                    <label class="col-form-label">'.$store.'</label>
                                 </div>
                                 <div class="col-md-4">
                                     <input type="number" class="form-control" placeholder="Введите значение">