[ERP-137] ранее использовались ключи дополнительных полей, теперь коды

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index c1b242221fd6c00264e17c58f5d58ac2a3906e29..38b19c445f315cbbde2d80e1bf7a2ec7ac1ebf91 100644 (file)
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -663,9 +663,9 @@ class MotivationService
     public static function calculateMonthForecast($store_id, $year, $month) {
         $motivationCostsItem = MotivationCostsItem::find()->all();
         $motivationCostsItemCodes = ArrayHelper::getColumn($motivationCostsItem, 'code');
-        $additionalItemsKeys = array_keys(self::$additionalItems);
+        $additionalItemsCodes = ArrayHelper::getColumn(self::$additionalItems, 'code');
 
-        $items = array_merge($motivationCostsItemCodes, $additionalItemsKeys);
+        $items = array_merge($motivationCostsItemCodes, $additionalItemsCodes);
 
         $motivationValueGroups = [];
         foreach (range(1, 5) as $ind) {
@@ -698,21 +698,7 @@ class MotivationService
                         };
                     }
                 }
-                if (!$motivationValue) {
-                    $motivationValue = new MotivationValue;
-                    $motivationValue->motivation_id = $motivation->id;
-                    $motivationValue->motivation_group_id = $motivationValueGroupForecast->id;
-                    $motivationValue->value_id = $code;
-                }
-                $motivationValue->value_type = $sum_type;
-                switch ($sum_type) {
-                    case MotivationCostsItem::DATA_TYPE_INT: { $motivationValue->value_int = $sum; break; }
-                    default: { $motivationValue->value_float = $sum; break; }
-                }
-                $motivationValue->save();
-                if ($motivationValue->getErrors()) {
-                    throw new \Exception(Json::encode($motivationValue->getErrors()));
-                }
+                self::saveOrUpdateMotivationValue($motivation->id, "forecast", $code, $sum_type, $sum);
             }
         }
     }