Изменение структуры

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 250a650c70123e0005610a073cfa57593ccb6079..f72eba58ce1aa26317614446f8ba9ee0e65b3da1 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -2772,7 +2772,15 @@ class DataController extends BaseController
             ->orderBy(['marketplace_id' => SORT_ASC,'posit' => SORT_ASC])
             ->all();
         $data = [];
+        foreach ([1 => "ФлауВау", 2 => "ЯндексМаркет"] as $marketplaceId => $marketplaceName) {
+            $data[$marketplaceId] = [
+                'id' => $marketplaceId,
+                'name' =>  $marketplaceName,
+                 ] ;
         foreach ($statuses as $status) {
+            if ($status->marketplace_id !== $marketplaceId) {
+                continue;
+            }
             /* @var $status MarketplaceOrder1cStatuses */
             $relftions = $status->relationsFrom;
             $relationsToSend = [];
@@ -2781,24 +2789,17 @@ class DataController extends BaseController
                 if(!$statusTo) {
                     continue;
                 }
-                $order = $relation['order'];
-                $description = $relation['description'];
-                $buttonText = $relation['button_text'];
-                $relationsToSend[] = [
-                    'status' => $statusTo->status,
-                    'status_id' => $statusTo->status_id,
-                    'description' => $description,
-                    'button_text' => $buttonText,
-                    'order' => $order,
-                ];
+                $relationsToSend[] =
+                    $statusTo->status_id;
             }
-            $data []= [
-                'marketplace' => [1 => "ФлауВау", 2 => "ЯндексМаркет"][$status->marketplace_id],
-                'status' => $status->status,
+            $data[$marketplaceId] ['statuses'][] = [
+                'index_number' => $status->posit,
+                'status_name' => $status->status,
+                'hint' => $status->status_instruction,
                 'status_id' => $status->status_id,
-                'status_instruction' => $status->status_instruction,
-                'status_relations' => $relationsToSend
-            ];
+                'allowed_statuses' => $relationsToSend
+                ];
+            }
         }
         return $data;
     }