ERP-243 Действия по замене (II этап)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 95f062b56b9034f0ae4ba03a99adc3e9adca0bfc..4641a9437a7889813d5253cfc6b35541302cd2fe 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -151,12 +151,12 @@ class ShiftTransferController extends Controller
     {
         if (Yii::$app->request->post()) {
             $action = Yii::$app->request->post('action');
-
+            $model = ShiftTransfer::findOne($id);
             if ($action === 'accept') {
-                $model = ShiftTransfer::findOne($id);
                 $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_ACCEPTED]);
                 ShiftRemains::updateAll(['type' => ShiftRemains::ARCHIVE_RECORD], ['shift_transfer_id' => $id]);
             } elseif ($action === 'save') {
+                $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_READY_TO_ACCEPT]);
                 EqualizationRemains::updateData(Yii::$app->request->post()['ShiftTransfer']['equalizationRemains'], $id);
             }
         }

diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index b42e5fede3b4b4586eb0b34d49775470ea70bb21..834ae51f0c63c9152fde9766d83da3f7ca6f18ea 100644 (file)
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -105,7 +105,7 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
             ],
             [
                 'name' => 'product_replacement_count',
-                'type' => BaseColumn::TYPE_TEXT_INPUT, 
+                'type' => BaseColumn::TYPE_TEXT_INPUT,
                 'options' => ['type' => 'number', 'step' => 1,],
                 'title' => 'Количество',
                 'value' => function ($data) {