Правки структуры статусов

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 4c57788f3f214edb5d271fb28aff586d7c919f38..6b82d6d4405efecf0a696ea22fdffc0e19a8e9eb 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -182,10 +182,10 @@ class DataController extends BaseController
                 $mess['create_employee'] = $createEmployeeArray;
             }
 
-            $createMarketplaceStatuses = $this->getMarketplaceStatuses();
-            if (!empty($createMarketplaceStatuses)) {
-                $mess['create_marketplace']['statuses'] = $createMarketplaceStatuses;
-            }
+//            $createMarketplaceStatuses = $this->getMarketplaceStatuses();
+//            if (!empty($createMarketplaceStatuses)) {
+//                $mess['create_marketplace']['statuses'] = $createMarketplaceStatuses;
+//            }
 
             $replacementInvoiceArray = $this->getResortingDoc();
             $replacementInvoice = $replacementInvoiceArray['replacementInvoice'];
@@ -2769,38 +2769,40 @@ class DataController extends BaseController
 
     private function getMarketplaceStatuses()
     {
-        $statuses = MarketplaceOrder1cStatuses::find()
-            ->orderBy(['marketplace_id' => SORT_ASC,'posit' => SORT_ASC])
-            ->all();
+        $marketplaces = [
+            MarketplaceOrder1cStatuses::GUID_FLOWWOW => "ФлауВау",
+            MarketplaceOrder1cStatuses::GUID_YANDEXMARKET => "ЯндексМаркет"
+        ];
         $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 = [];
-            foreach ($relftions as $relation) {
-                $statusTo = MarketplaceOrder1cStatuses::find()->where(['id' => $relation['status_id_to']])->one();
-                if(!$statusTo) {
-                    continue;
+        foreach ($marketplaces as $marketplaceGuid => $marketplaceName) {
+            $statuses = MarketplaceOrder1cStatuses::find()->where(['marketplace_id' => MarketplaceOrder1cStatuses::guid2id()[$marketplaceGuid]])
+                ->orderBy(['posit' => SORT_ASC])->all();
+            $statusesData = [];
+            foreach ($statuses as $status) {
+                /* @var $status MarketplaceOrder1cStatuses */
+                $relftions = $status->relationsFrom;
+                $relationsToSend = [];
+                foreach ($relftions as $relation) {
+                    $statusTo = MarketplaceOrder1cStatuses::find()->where(['id' => $relation['status_id_to']])->one();
+                    if(!$statusTo) {
+                        continue;
+                    }
+                    $relationsToSend[] =
+                        $statusTo->status_id;
                 }
-                $relationsToSend[] =
-                    $statusTo->status_id;
-            }
-            $data[$marketplaceId] ['statuses'][] = [
-                'index_number' => $status->posit,
-                'status_name' => $status->status,
-                'hint' => $status->status_instruction,
-                'status_id' => $status->status_id,
-                'allowed_statuses' => $relationsToSend
+                $statusesData [] = [
+                    'index_number' => $status->posit,
+                    'status_name' => $status->status,
+                    'hint' => $status->status_instruction,
+                    'status_id' => $status->status_id,
+                    'allowed_statuses' => $relationsToSend
                 ];
             }
+            $data[] = [
+                'id' => $marketplaceGuid,
+                'name' => $marketplaceName,
+                'statuses' => $statusesData
+            ];
         }
         return $data;
     }

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 401457efac6f643b62100d1e10f67d1f6a1fdd6e..1b09d23bb4f01ccb4b9104fde695c7fc942fc6ce 100644 (file)
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -116,14 +116,14 @@ class CronController extends Controller
                     'allowed_statuses' => $relationsToSend
                 ];
             }
-            $data['statuses'] []= [
+            $data[] = [
                 'id' => $marketplaceGuid,
                 'name' => $marketplaceName,
                 'statuses' => $statusesData
             ];
         }
 
-        $json_post = '{"request_id": "' . $req_id . '", "create_marketplace":' . Json::encode($data) . '}';
+        $json_post = '{"request_id": "' . $req_id . '", "create_marketplaces":' . Json::encode($data) . '}';
 
         $this->setApiCron($req_id, $json_post);