]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
правки по боту income show fix
authorAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Sun, 28 Apr 2024 15:21:40 +0000 (18:21 +0300)
committerAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Sun, 28 Apr 2024 15:21:40 +0000 (18:21 +0300)
erp24/api3/core/services/IncomeService.php

index ba233f222559979c0a8293c2fad76364a480c616..dc63bbdb78235d44fa4df15f62a50b1607693fb5 100644 (file)
@@ -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])