From 64663e0677b5531612eafd9ee0f53753d4b2ad30 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 2 Aug 2024 15:53:50 +0300 Subject: [PATCH] =?utf8?q?=D0=A1=D0=BE=D1=88=D0=BB=D0=B8=D1=81=D1=8C=20?= =?utf8?q?=D0=BD=D0=B0=20=D1=82=D0=BE=D0=BC,=20=D1=87=D1=82=D0=BE=20=D0=B8?= =?utf8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=20=D0=BA?= =?utf8?q?=D0=BE=D0=B4=20=D0=B2=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0?= =?utf8?q?=D1=85=20=D0=BD=D0=B0=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BE?= =?utf8?q?=D1=87=D0=BD=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 58270cde..544348ea 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -383,12 +383,12 @@ class MotivationService $motivation = Motivation::find()->where(['store_id' => $store_id, 'year' => $year, 'month' => $month])->one(); if ($motivation) { $motivationValue = MotivationValue::find()->where(['motivation_id' => $motivation->id, - 'motivation_group_id' => $motivationValueGroup->id, 'value_id' => $motivationCostsItem->id])->one(); + 'motivation_group_id' => $motivationValueGroup->id, 'value_id' => $motivationCostsItem->code])->one(); if (!$motivationValue) { $motivationValue = new MotivationValue; $motivationValue->motivation_id = $motivation->id; $motivationValue->motivation_group_id = $motivationValueGroup->id; - $motivationValue->value_id = $motivationCostsItem->id; + $motivationValue->value_id = $motivationCostsItem->code; $motivationValue->value_type = $motivationCostsItem->data_type; } $motivationValue->value_float = $salesProduct['total']; @@ -438,12 +438,12 @@ class MotivationService /** @var $motivationCostsItem MotivationCostsItem */ if ($motivation) { $motivationValue = MotivationValue::find()->where(['motivation_id' => $motivation->id, - 'motivation_group_id' => $motivationValueGroup->id, 'value_id' => $motivationCostsItem->id])->one(); + 'motivation_group_id' => $motivationValueGroup->id, 'value_id' => $motivationCostsItem->code])->one(); if (!$motivationValue) { $motivationValue = new MotivationValue; $motivationValue->motivation_id = $motivation->id; $motivationValue->motivation_group_id = $motivationValueGroup->id; - $motivationValue->value_id = $motivationCostsItem->id; + $motivationValue->value_id = $motivationCostsItem->code; $motivationValue->value_type = $motivationCostsItem->data_type; } $motivationValue->value_float = $salesProduct['total']; -- 2.39.5