[ERP-331] после применения замечаний Романа

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 0a20dc6cb4411486dce76123981a8624375f254a..8dd5305207f1b107064783991cdf80e1b03c55a1 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -181,7 +181,7 @@ class DataController extends BaseController
             if (!empty($newOrdersArray)) {
                 $mess['create_orders'] = $newOrdersArray;
             }
-            return $this->asJson($mess);
+
 //            $mess['delete_employee'] = [
 //                ['id' => '06202309-2808-0427-d4c9-100030128795'],
 //                ['id' => '06202309-2855-0215-4f5d-100043236389']
@@ -742,27 +742,45 @@ class DataController extends BaseController
         $result = [];
         foreach ($marketplaceOrders as $marketplaceOrder) {
             /* @var MarketplaceOrders $marketplaceOrder */
+            $items = Json::decode(Json::encode($marketplaceOrder->items));
+            $itemsFiltered = [];
+            foreach ($items as $item) {
+                $itemsFiltered []= [
+                    'product_id' => '', // 'TODO: идентификатор товара'
+                    'color' => null, // 'TODO: характеристика товара (если есть)'
+                    'price' => $item['price'],
+                    'quantity' => $item['count'],
+                    'seller_id' => '', // 'TODO: продавец для данной строки товара'
+                ];
+            }
             $result[] = [
                 'id' => $marketplaceOrder->guid,
-                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
                 'store_id' => $marketplaceOrder->store_id,
-                'status_id' => $marketplaceOrder->status_id,
-                'substatus_id' => $marketplaceOrder->substatus_id,
-                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
-                'creation_date' => $marketplaceOrder->creation_date,
-                'updated_at' => $marketplaceOrder->updated_at,
-                'returned_at' => $marketplaceOrder->returned_at,
-                'return_data' => $marketplaceOrder->return_data,
-                'fake' => $marketplaceOrder->fake,
-                'total' => $marketplaceOrder->total,
-                'delivery_total' => $marketplaceOrder->delivery_total,
-                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
-                'tax_system' => $marketplaceOrder->tax_system,
-                'payment_type' => $marketplaceOrder->payment_type,
-                'payment_method' => $marketplaceOrder->payment_method,
-                'cancel_requested' => $marketplaceOrder->cancel_requested,
-                'raw_data' => $marketplaceOrder->raw_data,
-                'items' => Json::encode($marketplaceOrder->items),
+                'comment' => '',          // 'TODO: комментарий для документа',
+                'summ' => 0,              // 'TODO:  сумма документа'
+                'seller_id' => null,      // 'TODO:  продавец (для документа в целом, может не заполняться)'
+                'status' => 0,            // 'TODO:  статус заказа (0 - не собран, 1 - собран и согласован, 2 - продан)'
+                'cancelled' => false,     // 'TODO: признак отмены заказа (истина, если отменен)'
+                'marketplace' => '',      // 'TODO: признак заказа с маркетплейса'
+                'marketplace_name' => '', // 'TODO: название маркетплейса, с которого поступил заказ'
+                'items' => $itemsFiltered,
+//                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
+//                'status_id' => $marketplaceOrder->status_id,
+//                'substatus_id' => $marketplaceOrder->substatus_id,
+//                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
+//                'creation_date' => $marketplaceOrder->creation_date,
+//                'updated_at' => $marketplaceOrder->updated_at,
+//                'returned_at' => $marketplaceOrder->returned_at,
+//                'return_data' => $marketplaceOrder->return_data,
+//                'fake' => $marketplaceOrder->fake,
+//                'total' => $marketplaceOrder->total,
+//                'delivery_total' => $marketplaceOrder->delivery_total,
+//                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
+//                'tax_system' => $marketplaceOrder->tax_system,
+//                'payment_type' => $marketplaceOrder->payment_type,
+//                'payment_method' => $marketplaceOrder->payment_method,
+//                'cancel_requested' => $marketplaceOrder->cancel_requested,
+//                'raw_data' => $marketplaceOrder->raw_data,
             ];
         }
         return $result;