From 28808ec6f2be22f78292001cd2e575394273ec45 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 20 Aug 2024 11:07:21 +0300 Subject: [PATCH] =?utf8?q?[ERP-140]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?utf8?q?=D1=8F=D0=B5=D1=82=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=86?= =?utf8?q?=D0=B8=D1=8E=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=81=D1=82=D0=B0?= =?utf8?q?=D0=B2=D1=88=D0=B8=D1=85=D1=81=D1=8F=20=D0=BF=D0=BE=D0=BB=D0=B5?= =?utf8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 358600ef..65f870e7 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -1304,8 +1304,9 @@ class MotivationService foreach ($motivations as $motivation) { $plan = self::getMotivationValue($motivation->id, 7, 27); + $adjustment = self::getMotivationValue($motivation->id, 8, 27); self::saveOrUpdateMotivationValue($motivation->id, - "fact", 27, "float", $plan); + "fact", 27, "float", $plan + $adjustment); } } @@ -1316,8 +1317,9 @@ class MotivationService foreach ($motivations as $motivation) { $plan = self::getMotivationValue($motivation->id, 7, 28); + $adjustment = self::getMotivationValue($motivation->id, 8, 28); self::saveOrUpdateMotivationValue($motivation->id, - "fact", 28, "float", $plan); + "fact", 28, "float", $plan + $adjustment); } } @@ -1339,8 +1341,9 @@ class MotivationService foreach ($motivations as $motivation) { /** @var $motivation Motivation */ $tariff = self::getMotivationValue($motivation->id, 7, 36); + $adjustment = self::getMotivationValue($motivation->id, 8, 36); self::saveOrUpdateMotivationValue($motivation->id, - "fact", 29, "float", $tariff * ($timetableFactModels[$motivation->store_id]['cnt'] ?? 0)); + "fact", 29, "float", $tariff * ($timetableFactModels[$motivation->store_id]['cnt'] ?? 0) + $adjustment); } } @@ -1351,8 +1354,9 @@ class MotivationService foreach ($motivations as $motivation) { $plan = self::getMotivationValue($motivation->id, 7, 31); + $adjustment = self::getMotivationValue($motivation->id, 8, 31); self::saveOrUpdateMotivationValue($motivation->id, - "fact", 31, "float", $plan); + "fact", 31, "float", $plan + $adjustment); } } @@ -1363,8 +1367,9 @@ class MotivationService foreach ($motivations as $motivation) { $plan = self::getMotivationValue($motivation->id, 7, 32); + $adjustment = self::getMotivationValue($motivation->id, 8, 32); self::saveOrUpdateMotivationValue($motivation->id, - "fact", 32, "float", $plan); + "fact", 32, "float", $plan + $adjustment); } } -- 2.39.5