From: marina <m.zozirova@gmail.com>
Date: Tue, 29 Oct 2024 06:41:13 +0000 (+0300)
Subject: Merge branch 'develop' into mmm
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7c3d2de90cf6099b4a7cd7124d22da98c06ff953;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into mmm
---

7c3d2de90cf6099b4a7cd7124d22da98c06ff953
diff --cc erp24/services/MotivationService.php
index 22a3ad6a,6fe790d9..d583651c
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@@ -183,9 -186,10 +186,10 @@@ class MotivationServic
          $motivationValues = MotivationValue::find()
              ->where(['motivation_id' => $motivation->id])
              ->all();
 -
 +var_dump($motivationValues);die();
          // 3. Получение данных из MotivationCostsItem
          $costsItems = MotivationCostsItem::find()
+ //            ->where(['is_active' => true])
              ->indexBy('code')
              ->orderBy(['order' => SORT_ASC])
              ->all();