From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 17 Jun 2025 15:04:45 +0000 (+0300)
Subject: Перенос в DataController.php actionRequest
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1bb7a9af5dc1b9948993c965bfc9496531cdca5a;p=erp24_rep%2Fyii-erp24%2F.git

Перенос в DataController.php actionRequest
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 7160e7d5..626570fd 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -24,6 +24,7 @@ use yii_app\records\EqualizationRemains;
 use yii_app\records\ExportImportTable;
 use yii_app\records\Incoming;
 use yii_app\records\IncomingItems;
+use yii_app\records\MarketplaceOrder1cStatuses;
 use yii_app\records\MarketplaceOrderDelivery;
 use yii_app\records\MarketplaceOrders;
 use yii_app\records\MarketplaceOrderStatusTypes;
@@ -64,8 +65,8 @@ class DataController extends BaseController
 
     const OUT_DIR =
 //        __DIR__ . "/../json";
-        //    "/www/api2/json";
-        "/var/www/erp24/api2/json";
+            "/www/api2/json";
+        //"/var/www/erp24/api2/json";
 
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
     private static function getPathJson()
@@ -181,6 +182,11 @@ class DataController extends BaseController
                 $mess['create_employee'] = $createEmployeeArray;
             }
 
+            $createMarketplaceStatuses = $this->getMarketplaceStatuses();
+            if (!empty($createMarketplaceStatuses)) {
+                $mess['create_marketplace']['statuses'] = $createMarketplaceStatuses;
+            }
+
             $replacementInvoiceArray = $this->getResortingDoc();
             $replacementInvoice = $replacementInvoiceArray['replacementInvoice'];
             $replacementInvoiceResult = $replacementInvoiceArray['replacementInvoiceResult'];
@@ -2759,4 +2765,41 @@ class DataController extends BaseController
             }
         }
     }
+
+    private function getMarketplaceStatuses()
+    {
+        $statuses = MarketplaceOrder1cStatuses::find()
+            ->orderBy(['marketplace_id' => SORT_ASC,'posit' => SORT_ASC])
+            ->all();
+        $data = [];
+        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;
+                }
+                $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,
+                ];
+            }
+            $data []= [
+                'marketplace' => [1 => "ФлауВау", 2 => "ЯндексМаркет"][$status->marketplace_id],
+                'status' => $status->status,
+                'status_id' => $status->status_id,
+                'status_instruction' => $status->status_instruction,
+                'status_relations' => $relationsToSend
+            ];
+        }
+        return $data;
+    }
 }