From: Alexander Smirnov Date: Fri, 2 Aug 2024 12:53:50 +0000 (+0300) Subject: Сошлись на том, что используем код в ссылках на справочник X-Git-Tag: 1.4~44^2~5 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=64663e0677b5531612eafd9ee0f53753d4b2ad30;p=erp24_rep%2Fyii-erp24%2F.git Сошлись на том, что используем код в ссылках на справочник --- 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'];