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

diff --git a/erp24/records/OrdersUnion.php b/erp24/records/OrdersUnion.php
index a6df5d98e0df1c952c623a7b715cf391a7fdfb2e..0bc637e824556baff49cea8bd8126f5dbeaa9d6a 100644 (file)
--- a/erp24/records/OrdersUnion.php
+++ b/erp24/records/OrdersUnion.php
@@ -107,15 +107,21 @@ 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' => array_key_exists('source', $params) ? $params['source'] : null])
-            ->andFilterWhere(['store_id' => array_key_exists('store_id', $params) ? $params['store_id'] : null])
-            ->andFilterWhere(['>=', 'delivery_date', array_key_exists('delivery_date', $params) ? $params['delivery_date'] . ' 00:00:00' : null])
-            ->andFilterWhere(['<=', 'delivery_date', array_key_exists('delivery_date', $params) ? $params['delivery_date'] . ' 23:59:59' : null])
+            ->andFilterWhere(['source' => $params['source'] ?? null])
+            ->andFilterWhere(['store_id' => $params['store_id'] ?? null])
             ->from(['orders' => $queryAmo->union($queryMarketplace, true)])
             ->orderBy('id desc');
 
+        if (array_key_exists('delivery_date', $params) && !empty($params['delivery_date'])) {
+            $query->andWhere([
+                'between',
+                'delivery_date',
+                $params['delivery_date'] . ' 00:00:00',
+                $params['delivery_date'] . ' 23:59:59'
+            ]);
+        }
+
         return new \yii\data\ArrayDataProvider([
             'allModels' => $query->all(),
             'pagination' => [