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

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 4641a9437a7889813d5253cfc6b35541302cd2fe..fd0db98ccda609a587d570a8b83d7e3494d1519f 100644 (file)
--- 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 834ae51f0c63c9152fde9766d83da3f7ca6f18ea..b26b68411636e860f93d627c0b797a48772487ee 100644 (file)
--- 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;