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

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

diff --git a/erp24/records/OrdersUnion.php b/erp24/records/OrdersUnion.php
index c812d704..a6df5d98 100644
--- a/erp24/records/OrdersUnion.php
+++ b/erp24/records/OrdersUnion.php
@@ -23,7 +23,7 @@ class OrdersUnion extends ActiveRecord
         'flowwow' => 'Flowwow',
     ];
 
-    public static function getOrders($params = null)
+    public static function getOrders($params = [])
     {
         $queryAmo = (new Query())
             ->select([
@@ -66,12 +66,12 @@ class OrdersUnion extends ActiveRecord
                     WHEN ms.warehouse_id = 1 THEN 'flowwow'
                     ELSE 'Marketplace' 
                 END AS source"),
-                    'mo.id',
-                    'mod.delivery_end AS delivery_date',
-                    'mo.status_id',
-                    'mo.store_id',
-                    'payment_method',
-                    'mo.total',
+                'mo.id',
+                'mod.delivery_end AS delivery_date',
+                'mo.status_id',
+                'mo.store_id',
+                'payment_method',
+                'mo.total',
                 new \yii\db\Expression("NULLIF(concat(country, ' ', city, ' ', street, ' ', house, ' ', apartment), '')::TEXT AS delivery_address"),
                 new \yii\db\Expression("(
                 SELECT jsonb_agg(jsonb_build_object(
@@ -109,10 +109,10 @@ class OrdersUnion extends ActiveRecord
 
 
         $query = (new Query())
-            ->andFilterWhere(['source' => $params['source']])
-            ->andFilterWhere(['store_id' => $params['store_id']])
-            ->andFilterWhere(['>=', 'delivery_date', $params['delivery_date'] . ' 00:00:00'])
-            ->andFilterWhere(['<=', 'delivery_date', $params['delivery_date'] . ' 23:59:59'])
+            ->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])
             ->from(['orders' => $queryAmo->union($queryMarketplace, true)])
             ->orderBy('id desc');