From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 6 Aug 2025 12:35:37 +0000 (+0300)
Subject: добавление источника флаувау
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=81772757654037ed69797e700da0ef73b44803cf;p=erp24_rep%2Fyii-erp24%2F.git

добавление источника флаувау
---

diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index c3d002e8..f29a6db4 100644
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -107,7 +107,7 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
             [['number_1c'], 'string', 'max' => 100],
             [['warehouse_guid', 'guid', 'check_guid'], 'string', 'max' => 36],
             [['tax_system', 'payment_type', 'payment_method'], 'string', 'max' => 32],
-            [['marketplace_order_id'], 'unique'],
+            [['marketplace_order_id'], 'unique', 'targetAttribute' => ['marketplace_id', 'marketplace_order_id']],
         ];
     }
 
diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index f10ae786..ed2360e4 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1805,10 +1805,19 @@ class MarketplaceService
                 ->where(['marketplace_order_id' => (string)key($order)])
                 ->one();
                 if ($statusCode == 'DELIVERED' && $substatusCode == 'DELIVERY_SERVICE_DELIVERED' && $marketplaceOrder) {
-                    Yii::error('Заказ ' . $marketplaceOrder->marketplace_order_id);
+                    Yii::error('Заказ доставлен ' . $marketplaceOrder->marketplace_order_id);
                     /* @var $marketplaceOrder MarketplaceOrders */
                     $isCheckCreated = self::createCheckForMarketplaceOrder($marketplaceOrder);
                 }
+            if ($statusCode == 'CANCELLED' && $substatusCode == 'USER_CHANGED_MIND' && $marketplaceOrder) {
+                Yii::error('Заказ ' . $marketplaceOrder->marketplace_order_id);
+                /* @var $marketplaceOrder MarketplaceOrders */
+                $marketplaceOrder->cancelled_order_source = 'Flowwow';
+                $marketplaceOrder->cancelled_order_date = date('Y-m-d H:m:s');
+                if (!$marketplaceOrder->save()) {
+                    Yii::error('Метки отмены заказа не проставлены ' . $marketplaceOrder->marketplace_order_id);
+                }
+            }
         }
         return $count;
     }