From 674323a4aca47e7816101c35305274c75e2ab58b Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 15 May 2024 19:16:21 +0300 Subject: [PATCH] remove operation_sale where both should be accepted --- erp24/api3/core/services/ReportService.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php index 6d801d2a..f40acf4d 100644 --- a/erp24/api3/core/services/ReportService.php +++ b/erp24/api3/core/services/ReportService.php @@ -222,7 +222,6 @@ class ReportService ->leftJoin('sales_products p', 'p.check_id = s.id') ->where(['between', 's.date', $date_start, $date_end]) ->andWhere(['order_id' => ['', '0']]) - ->andWhere(['operation' => Sales::OPERATION_SALE]) ->andWhere(['p.product_id' => array_keys($products1c)]) ->groupBy(['s.store_id', 's.admin_id']) ->asArray()->all(); @@ -648,7 +647,6 @@ class ReportService ]) ->leftJoin('sales_products p', 'p.check_id = s.id') ->where(['between', 's.date', $date_start, $date_end]) ->andWhere(['order_id' => ['', '0']]) - ->andWhere(['operation' => Sales::OPERATION_SALE]) ->andWhere(['p.product_id' => array_keys($products1c)]) ->andWhere(['store_id' => $data->stores]) ->groupBy(['store_id']) -- 2.39.5