From 02473209c17a40067d708f1a465d8022c9967674 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Sun, 28 Apr 2024 18:21:40 +0300 Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D0=B1=D0=BE=D1=82=D1=83=20income=20show=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/IncomeService.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erp24/api3/core/services/IncomeService.php b/erp24/api3/core/services/IncomeService.php index ba233f2..dc63bbd 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]) -- 2.39.5