From 0a8647e7b9e0e886c1caa5cef34cf585f19739f8 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 6 Aug 2025 16:32:40 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=B2=20=D0=BC?=
 =?utf8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ..._source_date_fields_to_marketplace_orders_table.php |  2 +-
 erp24/records/MarketplaceOrders.php                    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/erp24/migrations/m250718_093101_add_cancelled_order_source_date_fields_to_marketplace_orders_table.php b/erp24/migrations/m250718_093101_add_cancelled_order_source_date_fields_to_marketplace_orders_table.php
index 0c4cdff5..a4953f62 100644
--- a/erp24/migrations/m250718_093101_add_cancelled_order_source_date_fields_to_marketplace_orders_table.php
+++ b/erp24/migrations/m250718_093101_add_cancelled_order_source_date_fields_to_marketplace_orders_table.php
@@ -26,7 +26,7 @@ class m250718_093101_add_cancelled_order_source_date_fields_to_marketplace_order
             $this->addColumn(
                 self::TABLE_NAME,
                 'cancelled_order_date',
-                $this->timestamp()->null()->comment('Время отправки отмененного заказа в 1С')
+                $this->timestamp()->null()->comment('Время отмены заказа')
             );
         }
     }
diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index f29a6db4..aad1a361 100644
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -47,6 +47,8 @@ use yii\db\Expression;
  * @property string|null $sent_1c_at Время отправки заказа в 1С
  * @property int|null $attempts_number Количество попыток отправки заказа в 1С
  * @property int $cancelled_order_sent Флаг отправки отмененного заказа в 1С
+ * @property string|null $cancelled_order_source Источник отмененного заказа
+ * @property string|null $cancelled_order_date Время отмены заказа
  */
 class MarketplaceOrders extends \yii\db\ActiveRecord
 {
@@ -94,14 +96,14 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['store_id', 'warehouse_guid', 'returned_at', 'return_data', 'raw_data', 'guid', 'manager_link', 'check_guid'], 'default', 'value' => null],
+            [['store_id', 'warehouse_guid', 'returned_at', 'return_data', 'raw_data', 'guid', 'manager_link', 'check_guid', 'cancelled_order_source', 'cancelled_order_date'], 'default', 'value' => null],
             [['cancel_requested', 'status_telegram', 'readyto_1c'], 'default', 'value' => 0],
             [['marketplace_order_id', 'marketplace_id', 'marketplace_name', 'status_id', 'substatus_id', 'creation_date', 'updated_at', 'total', 'delivery_total', 'buyer_total_before_discount', 'tax_system', 'payment_type', 'payment_method'], 'required'],
             [['store_id', 'status_id', 'substatus_id', 'fake', 'cancel_requested', 'status_1c', 'status_processing_1c', 'order_link', 'delivery_to', 'order_photo'], 'default', 'value' => null],
             [[ 'fake'], 'default', 'value' => 0],
             [['store_id', 'status_id', 'substatus_id', 'fake', 'cancel_requested', 'status_1c', 'marketplace_id', 'status_telegram', 'status_processing_1c', 'readyto_1c', 'attempts_number', 'cancelled_order_sent'], 'integer'],
-            [['creation_date', 'updated_at', 'returned_at', 'sent_1c_at'], 'safe'],
-            [['return_data', 'raw_data', 'marketplace_name', 'telegram_error', 'order_link', 'delivery_to', 'order_photo', 'manager_link'], 'string'],
+            [['creation_date', 'updated_at', 'returned_at', 'sent_1c_at', 'cancelled_order_date'], 'safe'],
+            [['return_data', 'raw_data', 'marketplace_name', 'telegram_error', 'order_link', 'delivery_to', 'order_photo', 'manager_link', 'cancelled_order_source'], 'string'],
             [['total', 'delivery_total', 'buyer_total_before_discount'], 'number'],
             [['marketplace_order_id', 'seller_id'], 'string', 'max' => 64],
             [['number_1c'], 'string', 'max' => 100],
@@ -156,6 +158,8 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
             'sent_1c_at' => 'Время отправки заказа в 1С',
             'attempts_number' => 'Количество попыток отправки заказа в 1С',
             'cancelled_order_sent' => 'Флаг отправки отмененного заказа в 1С',
+            'cancelled_order_source' => 'Источник отмененного заказа',
+            'cancelled_order_date' => 'Время отмены заказа',
         ];
     }
 
-- 
2.39.5