From b9fea1a48b5d803e1352571f17b24977eaecae85 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 3 Dec 2024 15:17:05 +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 0617d72e..dbe69cca 100644 --- a/erp24/controllers/ShiftTransferController.php +++ b/erp24/controllers/ShiftTransferController.php @@ -164,6 +164,7 @@ class ShiftTransferController extends Controller if ($action === 'accept') { $model->updateAttributes(['date_end' => date('Y-m-d H:i:s')]); $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_ACCEPTED]); + $model->updateAttributes(['start_shift_admin_id' => Yii::$app->user->id]); ShiftRemains::updateAll(['type' => ShiftRemains::ARCHIVE_RECORD], ['shift_transfer_id' => $id]); ReplacementInvoice::setData($model); StoreBalance::setData($model); diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php index 1937192c..e22c7c37 100644 --- a/erp24/views/shift-transfer/_replacement.php +++ b/erp24/views/shift-transfer/_replacement.php @@ -225,7 +225,7 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO ], ], 'showPageSummary' => true, - 'footerRowOptions' => ['class' => 'footer-row'], + 'layout' => '{items}', ]); if (in_array(Yii::$app->user->id, $usersOnStoreArray) && $shiftTransfer->status_id == ShiftTransfer::STATUS_ID_READY_TO_ACCEPT) { -- 2.39.5