]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
[ERP-331] fix marketplace_name and id
authorAlexander Smirnov <fredeom@mail.ru>
Mon, 10 Mar 2025 12:27:47 +0000 (15:27 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Mon, 10 Mar 2025 12:27:47 +0000 (15:27 +0300)
erp24/api2/controllers/DataController.php

index 56d447d0221c4e48986bf15b819cc8cb840b1d6a..75668818e76aa50afc8140bf17a058655e542462 100644 (file)
@@ -735,7 +735,7 @@ class DataController extends BaseController
             ])->andWhere([
                 'between',
                 'creation_date',
-                date('Y-m-d 00:00:00', time()),
+                date('Y-m-d 00:00:00', strtotime('-3 days', time())),
                 date('Y-m-d 23:59:59', time())
             ])
             ->all();
@@ -764,8 +764,8 @@ class DataController extends BaseController
                 'seller_id' => '',
                 'status' => 0,
                 'cancelled' => false,
-                'marketplace' => $marketplaceOrder->marketplace_order_id,
-                'marketplace_name' => '', // 'TODO: название маркетплейса, с которого поступил заказ'
+                'marketplace' => $marketplaceOrder->marketplace_id,
+                'marketplace_name' => $marketplaceOrder->marketplace_name,
                 'items' => $itemsFiltered,
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,