]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
[ERP-140] Отображает корректно корректировку
authorAlexander Smirnov <fredeom@mail.ru>
Mon, 19 Aug 2024 07:33:55 +0000 (10:33 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Mon, 19 Aug 2024 07:33:55 +0000 (10:33 +0300)
erp24/services/MotivationService.php
erp24/views/motivation/index.php

index de3166d50cdebdcad6583bb700a0f00a05208e0d..358600ef73fa8418503ec786a9df8358bbea1025 100644 (file)
@@ -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,
index 38386efcadefcf479a0a223c760884edfa182d43..b86942472cfdf584963b06ffac404f3551c97429 100644 (file)
@@ -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 " ";
                                 }