From 889a79700046663e346d372fd2d72c349b48868b Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Mon, 19 Aug 2024 10:33:55 +0300 Subject: [PATCH] =?utf8?q?[ERP-140]=20=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?utf8?q?=D0=B6=D0=B0=D0=B5=D1=82=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?utf8?q?=D1=82=D0=BD=D0=BE=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?utf8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 4 ++-- erp24/views/motivation/index.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index de3166d5..358600ef 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -134,7 +134,7 @@ class MotivationService 'code' => $costsItem->code, 'name' => $costsItem->name, 'plan' => null, - 'correction' => null, + 'adjustment' => null, 'week1' => null, 'week2' => null, 'week3' => null, @@ -170,7 +170,7 @@ class MotivationService if (!isset($result[$key])) { $result[$key] = array_merge($item, [ 'plan' => null, - 'correction' => null, + 'adjustment' => null, 'week1' => null, 'week2' => null, 'week3' => null, diff --git a/erp24/views/motivation/index.php b/erp24/views/motivation/index.php index 38386efc..b8694247 100644 --- a/erp24/views/motivation/index.php +++ b/erp24/views/motivation/index.php @@ -133,10 +133,10 @@ $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::P 'header' => 'План', ], [ - 'attribute' => 'correction', + 'attribute' => 'adjustment', 'value' => function ($model) { - if ($model["correction"] !== null && $model["correction"] !== '') { - return Yii::$app->formatter->asDecimal($model["correction"], 2); + if ($model["adjustment"] !== null && $model["adjustment"] !== '') { + return Yii::$app->formatter->asDecimal($model["adjustment"], 2); } else { return " "; } -- 2.39.5