From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 10 Mar 2025 12:27:47 +0000 (+0300)
Subject: [ERP-331] fix marketplace_name and id
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=09afb4484e45903ead9ad38371e28519c1f1676f;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-331] fix marketplace_name and id
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 56d447d0..75668818 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -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,