]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
ERP-329 Новый интерфейс для работы с заказами мп и амо
authormarina <m.zozirova@gmail.com>
Wed, 5 Mar 2025 10:51:28 +0000 (13:51 +0300)
committermarina <m.zozirova@gmail.com>
Wed, 5 Mar 2025 10:51:28 +0000 (13:51 +0300)
erp24/records/OrdersUnion.php

index d7b777fdceb4be9e29bbe868c4d674a9c907a94c..c812d704bcbfd7cab9444c0b60e9cbe799d0d602 100644 (file)
@@ -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');