From: marina <m.zozirova@gmail.com>
Date: Wed, 5 Mar 2025 10:51:28 +0000 (+0300)
Subject: ERP-329 Новый интерфейс для работы с заказами мп и амо
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d8425c9a6a8acaa7257188f4ba1be0b0ce52992e;p=erp24_rep%2Fyii-erp24%2F.git

ERP-329 Новый интерфейс для работы с заказами мп и амо
---

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');