From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 27 Mar 2025 10:56:54 +0000 (+0300)
Subject: Merge branch 'refs/heads/feature_fomichev_erp-392_get_orders_statuses_1C' into featur... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f45a097b8ddb0fb031448a3161e25f8f9c0429f4;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/feature_fomichev_erp-392_get_orders_statuses_1C' into feature_fomichev_erp-344_cancel_order_from_1C

# Conflicts:
#	erp24/api2/controllers/OrdersController.php
---

f45a097b8ddb0fb031448a3161e25f8f9c0429f4
diff --cc erp24/api2/controllers/OrdersController.php
index ee49df6c,a726888e..e99dd213
--- a/erp24/api2/controllers/OrdersController.php
+++ b/erp24/api2/controllers/OrdersController.php
@@@ -39,35 -40,12 +40,41 @@@ class OrdersController extends BaseCont
              ' ' . date("d.m.Y H:i:s", time()) . ' JSON: ' . $json . '  ',
              FILE_APPEND
          );
 +
 +        $__API_PARAMS = ['order_id', 'status'];
 +
 +        foreach ($__API_PARAMS as $paramName) {
 +            if (empty($result[$paramName])) {
 +                if ($paramName != 'order_id') {
 +                    LogService::apiErrorLog(
 +                        json_encode(
 +                            ["error_id" => 0, "error" => "$paramName is required"],
 +                            JSON_UNESCAPED_UNICODE
 +                        )
 +                    );
 +                }
 +                if ($paramName != 'status') {
 +                    LogService::apiErrorLog(
 +                        json_encode(
 +                            ["error_id" => 0, "error" => "$paramName is required"],
 +                            JSON_UNESCAPED_UNICODE
 +                        )
 +                    );
 +                }
 +                return $this->asJson(["error_id" => 0, "error" => "$paramName is required"]);
 +            }
 +        }
 +
 +        $orderGuid = $result['order_id'];
 +        $orderStatus = $result['status'];
 +        $updateResult = null;
 +        $orderStatus1CCodes = MarketplaceOrders::getStatusCodes($orderStatus);
+         // данные из запроса
+         $marketplaceGuid = $result['marketplace_id'];
+         $orderGuid = $result['order_id'];
+         $orderStatus = $result['status'];
+ 
+         // статусы маркетплейса
          $statuses = MarketplaceOrderStatusTypes::find()
              ->select(['id', 'code'])
              ->indexBy('code')