From 3a9e1ad74ecef4c15d7a90b7ea5056f4c454130a Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 2 Dec 2024 16:25:52 +0300 Subject: [PATCH] =?utf8?q?ERP-243=20=D0=94=D0=B5=D0=B9=D1=81=D1=82=D0=B2?= =?utf8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?utf8?q?=D0=B5=20(II=20=D1=8D=D1=82=D0=B0=D0=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/ShiftTransferController.php | 4 ++-- erp24/views/shift-transfer/_replacement.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php index 95f062b5..4641a943 100644 --- 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 b42e5fed..834ae51f 100644 --- 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) { -- 2.39.5