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

diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php
index 5d017997ac7d9808056fdc068ef83c8550549935..3c0ceb37250495282f3d4116275b4962cc34606d 100644 (file)
--- a/erp24/records/ReplacementInvoice.php
+++ b/erp24/records/ReplacementInvoice.php
@@ -138,7 +138,7 @@ class ReplacementInvoice extends \yii\db\ActiveRecord
     }
 
 
-    public function getCreatedBy() {
-        return $this->hasOne(Admin::class, ['id' => 'created_by']);
+    public function getCreatedAdmin() {
+        return $this->hasOne(Admin::class, ['id' => 'created_admin_id']);
     }
 }

diff --git a/erp24/views/replacement-invoice/view.php b/erp24/views/replacement-invoice/view.php
index c65a01d8e869df09cb91e4e98491c872e9b44a07..d339195b27ce0e7c98b8c4e8b5965fe5b1bdb05f 100644 (file)
--- a/erp24/views/replacement-invoice/view.php
+++ b/erp24/views/replacement-invoice/view.php
@@ -31,9 +31,9 @@ $this->params['breadcrumbs'][] = $this->title;
             'comment',
             'created_at::datetime',
             [
-                'attribute' => 'updated_by',
+                'attribute' => 'created_admin_id',
                 'value' => function ($model) {
-                    return $model->createdBy->name_full;
+                    return $model->createdAdmin->name_full;
                 }
             ],
         ],

diff --git a/erp24/views/shift-transfer/_transfer.php b/erp24/views/shift-transfer/_transfer.php
index 179a3ec645f2f319e4bbc2f4b09ad3f7f58f6020..52d3b1b53acf3834feab40d2c51ee489ade41f00 100644 (file)
--- a/erp24/views/shift-transfer/_transfer.php
+++ b/erp24/views/shift-transfer/_transfer.php
@@ -93,5 +93,4 @@ echo \kartik\grid\GridView::widget([
     ],
     'layout' => '{items}',
     'showPageSummary' => true,
-    'layout' => '{items}',
 ]); ?>
\ No newline at end of file