From 392a13d24a410e9204fa9519fdbd5d5db9da0baf Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 4 Sep 2024 17:28:57 +0300
Subject: [PATCH] =?utf8?q?[ERP-137]=20=D1=80=D0=B0=D0=BD=D0=B5=D0=B5=20?=
 =?utf8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?utf8?q?=D0=BB=D0=B8=D1=81=D1=8C=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=20?=
 =?utf8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB?=
 =?utf8?q?=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9,=20?=
 =?utf8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BA=D0=BE=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/MotivationService.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index c1b24222..38b19c44 100644
--- 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);
             }
         }
     }
-- 
2.39.5