ERP-402 Добавить в ЛК Флориста расчёт премии за авторские букеты

diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php
index 8948542b4600afcad5ecbcce747d66d62e94aa79..bc8098b9c80ed0df0ba83ef4c214b2ff06748544 100755 (executable)
--- a/erp24/services/SalesService.php
+++ b/erp24/services/SalesService.php
@@ -1359,7 +1359,7 @@ class SalesService
     FROM sales s
    LEFT JOIN sales_products sp ON sp.check_id = s.id
     LEFT JOIN products_1c p1 ON p1.id = sp.product_id
-    LEFT JOIN products_class pc ON p1.id = pc.category_id
+    LEFT JOIN products_class pc ON p1.parent_id = pc.category_id
     WHERE sp.seller_id IN (:admin_guid)
       AND (s.order_id = '' OR s.order_id = '0')
       AND pc.tip = :tip
@@ -1418,7 +1418,7 @@ class SalesService
     FROM sales s
     LEFT JOIN sales_products sp ON sp.check_id = s.id
     LEFT JOIN products_1c p1 ON p1.id = sp.product_id
-    LEFT JOIN products_class pc ON p1.id = pc.category_id
+    LEFT JOIN products_class pc ON p1.parent_id = pc.category_id
     WHERE s.seller_id IN (:admin_guid)
       AND pc.tip = :tip
       AND s.date >= :date_from
@@ -1432,7 +1432,6 @@ class SalesService
         ]);
 
 
-
         $action = $command->getRawSql();
 
         return $command->queryAll();