From d8425c9a6a8acaa7257188f4ba1be0b0ce52992e Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 5 Mar 2025 13:51:28 +0300 Subject: [PATCH] =?utf8?q?ERP-329=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20?= =?utf8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20?= =?utf8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=D0=BC=D0=B8=20=D0=BC=D0=BF?= =?utf8?q?=20=D0=B8=20=D0=B0=D0=BC=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/OrdersUnion.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erp24/records/OrdersUnion.php b/erp24/records/OrdersUnion.php index d7b777fd..c812d704 100644 --- a/erp24/records/OrdersUnion.php +++ b/erp24/records/OrdersUnion.php @@ -107,10 +107,12 @@ class OrdersUnion extends ActiveRecord ->leftJoin(['mod' => 'marketplace_order_delivery'], 'mo.id = mod.order_id') ->leftJoin(['ms' => 'marketplace_store'], 'ms.warehouse_guid::TEXT = mo.warehouse_guid::TEXT'); + $query = (new Query()) ->andFilterWhere(['source' => $params['source']]) ->andFilterWhere(['store_id' => $params['store_id']]) - ->andFilterWhere(['delivery_date' => $params['delivery_date']]) + ->andFilterWhere(['>=', 'delivery_date', $params['delivery_date'] . ' 00:00:00']) + ->andFilterWhere(['<=', 'delivery_date', $params['delivery_date'] . ' 23:59:59']) ->from(['orders' => $queryAmo->union($queryMarketplace, true)]) ->orderBy('id desc'); -- 2.39.5