From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 15 May 2024 16:16:21 +0000 (+0300)
Subject: remove operation_sale where both should be accepted
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=674323a4aca47e7816101c35305274c75e2ab58b;p=yii-erp24%2F.git

remove operation_sale where both should be accepted
---

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index 6d801d2..f40acf4 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'])