From 6fef67de94ca56276f14f8cb301baff4b0216574 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 5 Dec 2024 16:17:43 +0300
Subject: [PATCH] =?utf8?q?[ERP-258]=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?=
 =?utf8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D1=82=D1=8C,=20=D0=BF=D0=B5=D1=80?=
 =?utf8?q?=D0=B5=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D1=82=D1=8C,=20=D0=BF=D0=B5?=
 =?utf8?q?=D1=80=D0=B5=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D1=82=D1=8C=20=D0=BA?=
 =?utf8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/ShiftTransfer.php       |  2 +-
 erp24/views/shift-transfer/update.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/erp24/records/ShiftTransfer.php b/erp24/records/ShiftTransfer.php
index e46a5413..74155c3e 100644
--- a/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@ -88,7 +88,7 @@ class ShiftTransfer extends \yii\db\ActiveRecord
             'comment' => 'Комментарий',
             'report' => 'Отчёт',
             'product_groups' => 'Продуктовые группы',
-            'groups1' => 'Другая группа',
+            'groups1' => 'Другие группы',
             'groups2' => 'Основная группа'
         ];
     }
diff --git a/erp24/views/shift-transfer/update.php b/erp24/views/shift-transfer/update.php
index 521fb7a4..19a8704b 100644
--- a/erp24/views/shift-transfer/update.php
+++ b/erp24/views/shift-transfer/update.php
@@ -69,6 +69,13 @@ $this->registerCss('
     </div>
 
     <div class="row">
+        <div class="col-2">
+            <?php $hints2 = [ProductsClass::HINT_OTHER_ITEMS => 'Номенклатура 1%'] ?>
+            <?= $form->field($shiftTransfer, 'groups2')->checkboxList($hints2, ['checked' => 1]) ?>
+        </div>
+        <div id='acceptDiv' class="col-2 mt-5 d-none">
+            <?= Html::submitButton('Сформировать список по выбранным группам', ['class' => 'btn btn-secondary', 'name' => 'action', 'value' => 'applyGroups']) ?>
+        </div>
         <details>
             <summary>Другие</summary>
             <div class="col-9">
@@ -76,13 +83,6 @@ $this->registerCss('
                 <?= $form->field($shiftTransfer, 'groups1')->checkboxList($hints1, ['checked' => 1, 'onclick' => '$("#acceptDiv").removeClass("d-none");']) ?>
             </div>
         </details>
-        <div class="col-2">
-            <?php $hints2 = [ProductsClass::HINT_OTHER_ITEMS => 'Номенклатура 1%'] ?>
-            <?= $form->field($shiftTransfer, 'groups2')->checkboxList($hints2, ['checked' => 1]) ?>
-        </div>
-        <div id='acceptDiv' class="col-2 mt-5 d-none">
-            <?= Html::submitButton('Сформировать список по выбранным группам', ['class' => 'btn btn-success', 'name' => 'action', 'value' => 'applyGroups']) ?>
-        </div>
     </div>
 
     <div class="row">
-- 
2.39.5