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

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 0617d72eafa66baa31c7279e64a94a8867839bda..dbe69cca2fa3e9c35353d16d7b7bc52f4e127e17 100644 (file)
--- 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 1937192c39af814f4c68c40f63aa131deffc988b..e22c7c37970ec246cc8006a0032c07d390a998bd 100644 (file)
--- 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) {