From 7bc0c7bcfd1335bc72b1ef82c76fd56ef5b9c968 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 2 Dec 2024 16:46:09 +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 | 1 + erp24/views/shift-transfer/_replacement.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php index 4641a943..fd0db98c 100644 --- a/erp24/controllers/ShiftTransferController.php +++ b/erp24/controllers/ShiftTransferController.php @@ -153,6 +153,7 @@ class ShiftTransferController extends Controller $action = Yii::$app->request->post('action'); $model = ShiftTransfer::findOne($id); if ($action === 'accept') { + $model->updateAttributes(['date_end' => date('Y-m-d H:i:s')]); $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_ACCEPTED]); ShiftRemains::updateAll(['type' => ShiftRemains::ARCHIVE_RECORD], ['shift_transfer_id' => $id]); } elseif ($action === 'save') { diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php index 834ae51f..b26b6841 100644 --- a/erp24/views/shift-transfer/_replacement.php +++ b/erp24/views/shift-transfer/_replacement.php @@ -153,7 +153,7 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO ]), 'columns' => [ [ - 'attribute' => 'product_replacement_id', + 'attribute' => 'product_id', 'label' => 'Товар замена', 'value' => function ($model) { return $model->productReplacement->name; -- 2.39.5