From 464cd7f0890693fa76d75ffd501e4919edef2b33 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 3 Dec 2024 17:20:07 +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/views/replacement-invoice/index.php | 3 ++- erp24/views/store-balance/index.php | 10 +++++----- erp24/views/store-balance/view.php | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/erp24/views/replacement-invoice/index.php b/erp24/views/replacement-invoice/index.php index b5d0ee99..d5013720 100644 --- a/erp24/views/replacement-invoice/index.php +++ b/erp24/views/replacement-invoice/index.php @@ -26,6 +26,7 @@ $this->params['breadcrumbs'][] = $this->title; 'format' => 'raw', ], [ + 'label' => 'Магазин', 'attribute' => 'store_id', 'value' => function ($model) { return CityStore::findOne(\yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_guid])->entity_id)->name; @@ -34,7 +35,7 @@ $this->params['breadcrumbs'][] = $this->title; 'number', 'date', 'created_at', - [ + [ 'attribute' => 'created_admin_id', 'value' => function ($model) { return $model->createdAdmin->name_full; diff --git a/erp24/views/store-balance/index.php b/erp24/views/store-balance/index.php index c8fd35ff..523b8153 100644 --- a/erp24/views/store-balance/index.php +++ b/erp24/views/store-balance/index.php @@ -7,7 +7,7 @@ use yii_app\records\CityStore; /* @var $this yii\web\View */ /* @var $dataProvider yii\data\ActiveDataProvider */ -$this->title = 'Store Balances'; +$this->title = 'Баланс магазина'; $this->params['breadcrumbs'][] = $this->title; ?>
@@ -20,9 +20,10 @@ $this->params['breadcrumbs'][] = $this->title; 'id', [ + 'label' => 'Магазин', 'attribute' => 'store_id', 'value' => function ($model) { - return CityStore::findOne(\yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_id])->entity_id)->name; + return CityStore::findOne(\yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_id])->entity_id)->name; } ], [ @@ -37,16 +38,15 @@ $this->params['breadcrumbs'][] = $this->title; [ 'attribute' => 'status_id', 'value' => function ($model) { - return $model->status_id == \yii_app\records\StoreBalance::STATUS_NEW ? 'Новая' : $model->status_id; + return $model->status_id == \yii_app\records\StoreBalance::STATUS_NEW ? 'Новая' : $model->status_id; } ], [ 'attribute' => 'type_id', 'value' => function ($model) { - return $model->type_id == \yii_app\records\StoreBalance::REPLACEMENT_ACTIONS ? 'Действия по замене' : $model->type_id; + return $model->type_id == \yii_app\records\StoreBalance::REPLACEMENT_ACTIONS ? 'Действия по замене' : $model->type_id; } ], - 'comment_controler', [ 'class' => 'yii\grid\ActionColumn', 'template' => '{view}', // только кнопка просмотра diff --git a/erp24/views/store-balance/view.php b/erp24/views/store-balance/view.php index 8c2e85ac..944ff06a 100644 --- a/erp24/views/store-balance/view.php +++ b/erp24/views/store-balance/view.php @@ -23,6 +23,7 @@ $this->params['breadcrumbs'][] = $this->title; 'model' => $model, 'attributes' => [ [ + 'label' => 'Магазин', 'attribute' => 'store_id', 'value' => function ($model) { return CityStore::findOne(\yii_app\records\ExportImportTable::findOne(['export_val' => $model->store_id])->entity_id)->name; -- 2.39.5