From: marina <m.zozirova@gmail.com>
Date: Tue, 3 Dec 2024 12:17:05 +0000 (+0300)
Subject: ERP-243 Действия по замене (II этап)
X-Git-Tag: 1.7~201^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b9fea1a48b5d803e1352571f17b24977eaecae85;p=erp24_rep%2Fyii-erp24%2F.git

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

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) {