Добавляем ключ источника отмененного заказа

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index f206630587a3c7ab6fc58ade80eccbc0d7eebb66..815e89fac2e6964e2ccbd7247977532abd1fe9e2 100644 (file)
--- 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 f10ae78617121f268d0f3f79f8a1552e69801050..d60a38ae0b146d41add6917740fe65790282fc61 100644 (file)
--- 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 {