From f5d51e7f36da08e568100f41be1964671fd514a5 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 18 Jul 2025 17:04:23 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5?=
 =?utf8?q?=D0=BC=20=D0=BA=D0=BB=D1=8E=D1=87=20=D0=B8=D1=81=D1=82=D0=BE?=
 =?utf8?q?=D1=87=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD?=
 =?utf8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?utf8?q?=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/media/controllers/NotificationController.php | 11 +++++++++++
 erp24/services/MarketplaceService.php              |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index f2066305..815e89fa 100644
--- a/erp24/media/controllers/NotificationController.php
+++ b/erp24/media/controllers/NotificationController.php
@@ -289,6 +289,17 @@ class NotificationController extends Controller
                     $campaignId = $data['campaignId'];
                     $orderId    = $data['orderId'];
                     $orderData  = MarketplaceService::fetchOrder($campaignId, $orderId);
+                    $order = MarketplaceOrders::find()
+                        ->where(['marketplace_order_id' => (string)$orderId])
+                        ->one();
+                    if ($order) {
+                        $order->cancelled_order_source = 'Yandex Market';
+                        $order->cancelled_order_date = date('Y-m-d H:m:s');
+                        if (!$order->save()) {
+                            Yii::error('Ошибка сохранения заказа ' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE));
+                        }
+                    }
+
                     if (empty($orderData)) {
                         Yii::$app->response->statusCode = 400;
                         return $this->asJson([
diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index f10ae786..d60a38ae 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2106,7 +2106,11 @@ class MarketplaceService
                 }
             } else {
                 // отмена или успешное выполнение
-
+                if ($index == self::SUBJECT_INDEX[self::SUBJECT_CANCELLED]) {
+                    /** @var $marketplaceOrder MarketplaceOrders */
+                    $marketplaceOrder->cancelled_order_source = 'Yandex Market';
+                    $marketplaceOrder->cancelled_order_date = date('Y-m-d H:m:s');
+                }
                 if ($marketplaceOrder->save()) {
                     self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails);
                 } else {
-- 
2.39.5