[ERP-251] поправки

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index 0bdb1c38ce9642b6f316f0df84267900f0f8eda8..2226b4ee6de492dde48d342ea318e73d94e50731 100644 (file)
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -243,6 +243,7 @@ class MatrixErpController extends Controller
         $matrixErp->active = 0;
         $matrixErp->deleted_at = date('Y-m-d H:i:s');
         $matrixErp->deleted_by = Yii::$app->user->id;
+        $matrixErp->date_to = $matrixErp->deleted_at;
         $matrixErp->save();
 
         return $this->redirect('index');

diff --git a/erp24/views/matrix_erp/index.php b/erp24/views/matrix_erp/index.php
index 990c33f2c5691c3cfcdf033bee90bd88833ad5b4..c82e806edc9422643c4cc0bff4f52a3d5ab326c6 100644 (file)
--- a/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@ -197,7 +197,7 @@ $this->params['breadcrumbs'][] = $this->title;
                                         <td><?= $item->name ?></td>
                                         <td><?= $item->group_name ?></td>
                                         <td><?= $matrixPriceValueRow ?></td>
-                                        <td><?= $item-> date_from ?></td>
+                                        <td><?= $item->date_from ?></td>
                                         <td><?= $item->date_to ?></td>
                                         <td><?= (($item->active) ? 'Активна': 'Не активна') ?></td>
                                         <td><span style="white-space:nowrap;"><?= ($item->active ? $editUrl . "&nbsp;&nbsp;&nbsp;&nbsp;" . $deleteUrl : '')?></span></td>