[ERP-242] правки

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index e9fc994af079e2608f8b078d6ad807c697ff1eca..fb99c49c8aa631888ebdb9f066df0af4db838967 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -165,7 +165,7 @@ class ShiftTransferController extends Controller
         $result = [];
         foreach ($products as $key => $name) {
             if (isset($balance[$key])) {
-                $result[$key] = $name . ' - ' . $balance[$key];
+                $result[$key] = $name . ' (' . $balance[$key] . ' шт.)';
             }
         }
         return $result;

diff --git a/erp24/views/shift-transfer/update.php b/erp24/views/shift-transfer/update.php
index b1f0aecc59c9546d845055fc58ab76984bf32333..8fec40a7e646a42457cdc5d869d94ede9317b7c9 100644 (file)
--- a/erp24/views/shift-transfer/update.php
+++ b/erp24/views/shift-transfer/update.php
@@ -63,9 +63,6 @@ $this->registerCss('
                 ],
             ]) ?>
         </div>
-    </div>
-
-    <div class="row">
         <div class="col-6">
             <?= $form->field($shiftTransfer, 'date_start')->widget(DateTimePicker::class, [
                 'language' => 'ru',
@@ -77,17 +74,6 @@ $this->registerCss('
                 ],
             ]) ?>
         </div>
-        <div class="col-6">
-            <?= $form->field($shiftTransfer, 'date_end')->widget(DateTimePicker::class, [
-                'language' => 'ru',
-                'template' => '{input}',
-                'clientOptions' => [
-                    'autoclose' => true,
-                    'format' => 'Y-m-d H:i:s',
-                    'todayBtn' => true
-                ],
-            ]) ?>
-        </div>
     </div>
 
     <?= $form->field($shiftTransfer, 'end_shift_admin_id')->hiddenInput()->label(false) ?>