From cefc9b3de08fa5cf7a7f945bb02b34f4dd4618c1 Mon Sep 17 00:00:00 2001
From: Marina Zozirova <marina.zozirova@erp-flowers.ru>
Date: Fri, 20 Sep 2024 11:56:38 +0000
Subject: [PATCH] =?utf8?q?ERP-119=20=D0=92=D1=8B=D0=B2=D0=B5=D1=81=D1=82?=
 =?utf8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?=
 =?utf8?q?=D1=86=D1=83=20=D0=BF=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80?=
 =?utf8?q?=D0=B0=20=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?utf8?q?=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20?=
 =?utf8?q?=D0=BE=20=D1=82=D0=BE=D0=BC=20=D0=BA=D1=82=D0=BE=20=D1=81=D0=BE?=
 =?utf8?q?=D0=B7=D0=B4=D0=B0=D0=BB=20=D0=B8...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/WriteOffsErp.php      | 15 +++++++++++----
 erp24/views/write_offs_erp/view.php | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/erp24/records/WriteOffsErp.php b/erp24/records/WriteOffsErp.php
index 5c2b3b63..02f090ba 100644
--- a/erp24/records/WriteOffsErp.php
+++ b/erp24/records/WriteOffsErp.php
@@ -84,9 +84,9 @@ class WriteOffsErp extends \yii\db\ActiveRecord
             'id' => 'ID',
             'guid' => 'Guid документа',
             'status' => 'Статус',
-            'created_admin_id' => 'Created Admin ID',
+            'created_admin_id' => 'Создал списание',
             'updated_admin_id' => 'Updated Admin ID',
-            'confirm_admin_id' => 'confirm_admin_id',
+            'confirm_admin_id' => 'Подтвердил списание',
             'deleted_admin_id' => 'Deleted Admin ID',
             'store_id' => 'Магазин',
             'cause_id' => 'Причина списания',
@@ -153,8 +153,6 @@ class WriteOffsErp extends \yii\db\ActiveRecord
         return $this->hasOne(Products1c::class, ['id' => 'product_id'])->onCondition(['tip' => 'products'])->via('getWriteOffsProductsErps');
     }
 
-
-
     public function getProductsImages()
     {
         return $this->hasMany(WriteOffsProductsErp::className(), ['write_offs_erp_id' => 'id']);
@@ -564,6 +562,15 @@ class WriteOffsErp extends \yii\db\ActiveRecord
         $this->comment = $comment;
     }
 
+    public function getCreatedAdmin()
+    {
+        return $this->hasOne(Admin::class, ['id' => 'created_admin_id']);
+    }
+    public function getConfirmAdmin()
+    {
+        return $this->hasOne(Admin::class, ['id' => 'confirm_admin_id']);
+    }
+
     /**
      * @return string
      */
diff --git a/erp24/views/write_offs_erp/view.php b/erp24/views/write_offs_erp/view.php
index e684e7e5..162bf209 100644
--- a/erp24/views/write_offs_erp/view.php
+++ b/erp24/views/write_offs_erp/view.php
@@ -47,9 +47,19 @@ $this->registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View::
             'guid',
             'date',
             'number',
-//            'created_admin_id',
+            [
+                'attribute' => 'created_admin_id',
+                'value' => function ($model) {
+                    return $model->createdAdmin ? $model->createdAdmin->name : '';
+                }
+            ],
+            [
+                'attribute' => 'confirm_admin_id',
+                'value' => function ($model) {
+                    return $model->confirmAdmin ? $model->confirmAdmin->name : '';
+                }
+            ],
 //            'updated_admin_id',
-//            'confirm_admin_id',
 //            'store_id',
             [
                 'attribute' => 'cityStoreName',
-- 
2.39.5