From 33e72a72afb0aa5fdf7b0abd15f267305b129c19 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 3 Dec 2024 15:23:10 +0300 Subject: [PATCH] =?utf8?q?ERP-243=20=D0=94=D0=B5=D0=B9=D1=81=D1=82=D0=B2?= =?utf8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?utf8?q?=D0=B5=20(II=20=D1=8D=D1=82=D0=B0=D0=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/ReplacementInvoice.php | 4 ++-- erp24/views/replacement-invoice/view.php | 4 ++-- erp24/views/shift-transfer/_transfer.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php index 5d017997..3c0ceb37 100644 --- 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 c65a01d8..d339195b 100644 --- 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 179a3ec6..52d3b1b5 100644 --- 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 -- 2.39.5