From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 3 Sep 2025 12:53:33 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp-20250826_stocks_yandex
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=fa47268733bf524ac27d2ee70ec4f350190cd76a;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp-20250826_stocks_yandex

# Conflicts:
#	erp24/api2/controllers/DataController.php
#	erp24/controllers/MarketplaceOrdersController.php
---

fa47268733bf524ac27d2ee70ec4f350190cd76a
diff --cc erp24/api2/controllers/DataController.php
index dbad9088,edfef5c7..e859a232
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -28,7 -30,6 +30,8 @@@ use yii_app\records\MarketplaceOrder1cS
  use yii_app\records\MarketplaceOrderDelivery;
  use yii_app\records\MarketplaceOrders;
  use yii_app\records\MarketplaceOrderStatusTypes;
 +use yii_app\records\MarketplaceStore;
++use yii_app\records\MarketplaceStore;
  use yii_app\records\OrdersAmo;
  use yii_app\records\PaymentTypes;
  use yii_app\records\Prices;
@@@ -3043,8 -3226,8 +3226,8 @@@ class DataController extends BaseContro
              $substatus = $statusId1C->orderSubstatus;
  
              if (
-                 in_array($statusId1C->status_id, ['1013', '1010']) &&
+                 in_array($statusId1C->status_id, $statuses1cToChangeYandexMarketFakeOrderId) &&
 -                $marketplaceOrder->marketplace_id == 2
 +                $marketplaceOrder->marketplace_id == MarketplaceStore::YANDEX_WAREHOUSE_ID
              ) {
                  if (!$debug) {
                      $updateResult = MarketplaceService::updateOrderStatus(
diff --cc erp24/controllers/MarketplaceOrdersController.php
index 023f800a,d8dc2831..605a52a7
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@@ -747,7 -744,9 +747,9 @@@ class MarketplaceOrdersController exten
          if ($model->fake) {
              $model->status_id = $statusCancelled->id;
              $model->substatus_id = $substatusFailed->id;
+             $model->cancelled_order_source = 'ERP';
+             $model->cancelled_order_date = date('Y-m-d H:m:s');
 -            if ((int)$model->marketplace_id === 2) {
 +            if ((int)$model->marketplace_id === MarketplaceStore::YANDEX_WAREHOUSE_ID) {
                  $rawData = json_decode($model->raw_data, true, 512, JSON_THROW_ON_ERROR);
                  $rawData['status'] = $statusCancelled->code;
                  $rawData['substatus'] = $substatusFailed->code;