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

diff --git a/erp24/views/replacement-invoice/index.php b/erp24/views/replacement-invoice/index.php
index b5d0ee9965aa58c15a05618d627efe79a7168c38..d5013720e71d93bc5b80790856dce4f0628b82fe 100644 (file)
--- 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 c8fd35ff58e990f161384526e10b9e2af01b2087..523b81532bf1e5c0a9e21719b2dca0a142aa36b4 100644 (file)
--- 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;
 ?>
 <div class="store-balance-index">
@@ -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 8c2e85ac98bce1a8f0a744a226c13d3d767d6f62..944ff06aa2a324e7c5e554a128a2e83f498521da 100644 (file)
--- 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;