From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Sun, 28 Apr 2024 15:21:40 +0000 (+0300)
Subject: правки по боту income show fix
X-Git-Tag: 1.1~75^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=02473209c17a40067d708f1a465d8022c9967674;p=erp24_rep%2Fyii-erp24%2F.git

правки по боту income show fix
---

diff --git a/erp24/api3/core/services/IncomeService.php b/erp24/api3/core/services/IncomeService.php
index ba233f22..dc63bbdb 100644
--- a/erp24/api3/core/services/IncomeService.php
+++ b/erp24/api3/core/services/IncomeService.php
@@ -169,9 +169,8 @@ class IncomeService
             ->select(['date', 'check_id', 'product_id', 'number',
                 'quantity', 'price', 'discount', 'p.summ as summ'])
             ->alias('p')
-            ->innerJoin('sales')
-            ->where('sales.id = p.check_id')
-            ->andWhere(['p.seller_id' => $adminGuid])
+            ->innerJoin('sales', 'sales.id = p.check_id')
+            ->where(['p.seller_id' => $adminGuid])
             ->andWhere(['or', ['sales.order_id' => ''], ['sales.order_id' => '0']])
             ->andWhere(['p.product_id' => $matrixProductIds])
             ->andWhere(['>=', 'sales.date', $dateFrom])