From c45a3b665c2bf6737c26291950063369fd6cbe65 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 4 Sep 2024 16:56:03 +0300 Subject: [PATCH] =?utf8?q?[ERP-130]=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?utf8?q?=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB=D0=B0=20?= =?utf8?q?=D1=81=D0=B5=D0=B1=D0=B5=D1=81=D1=82=D0=BE=D0=B8=D0=BC=D0=BE?= =?utf8?q?=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 9abba216..90a9a6a5 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -459,7 +459,7 @@ class MotivationService } if ($exportImportTable) { - $writeOffs = WriteOffs::find()->alias('wo')->select(['wo.type', 'wo.date', 'wop.product_id', 'wop.quantity', 'wop.summ']) + $writeOffs = WriteOffs::find()->alias('wo')->select(['wo.type', 'wo.date', 'wop.product_id', 'wop.quantity', 'wop.price']) ->rightJoin('write_offs_products wop', 'wop.write_offs_id = wo.id') ->where(['between', 'wo.date', $weekStart, $weekEnd]) ->andWhere(['wo.store_id' => $exportImportTable->export_val]) @@ -482,7 +482,7 @@ class MotivationService continue; } $value = ($selfCostProductMap[date("Y-m-d", strtotime($data['date']))][$data['product_id']] ?? 0) * ($data['quantity'] ?? 0); - $sum += $value > 0 ? $value : ($data['summ'] ?? 0); + $sum += $value > 0 ? $value : ($data['price'] ?? 0) * ($data['quantity'] ?? 0); } $motivationItemType = MotivationCostsItem::writeOffsToMotivationItemMap($key); -- 2.39.5