From 3890aba142e7863926cfa5f9bcad0e37e3487a46 Mon Sep 17 00:00:00 2001 From: fomichev Date: Tue, 22 Apr 2025 18:04:03 +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=D1=8F=20=D0=B8=20=D0=BC=D0=B5?= =?utf8?q?=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?= =?utf8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../controllers/MarketplaceController.php | 26 ++++++++++ ...rder_photo_to_marketplace_orders_table.php | 51 +++++++++++++++++++ erp24/records/MarketplaceOrders.php | 6 ++- 3 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 erp24/media/controllers/MarketplaceController.php create mode 100644 erp24/migrations/m250422_141409_add_column_order_photo_to_marketplace_orders_table.php diff --git a/erp24/media/controllers/MarketplaceController.php b/erp24/media/controllers/MarketplaceController.php new file mode 100644 index 00000000..23b9f64b --- /dev/null +++ b/erp24/media/controllers/MarketplaceController.php @@ -0,0 +1,26 @@ +response->format = Response::FORMAT_JSON; + if (Yii::$app->request->isPost) { + $order = MarketplaceOrders::find()->where(['id`' => $id])->one(); + $entity = 'marketplace_order/order_phpto'; + $uploadedFile = UploadedFile::getInstanceByName('file'); + if ($uploadedFile && $order) { + FileService::saveUploadedFile($uploadedFile, $entity, $order->id); + } + } + + } +} \ No newline at end of file diff --git a/erp24/migrations/m250422_141409_add_column_order_photo_to_marketplace_orders_table.php b/erp24/migrations/m250422_141409_add_column_order_photo_to_marketplace_orders_table.php new file mode 100644 index 00000000..efbce4d7 --- /dev/null +++ b/erp24/migrations/m250422_141409_add_column_order_photo_to_marketplace_orders_table.php @@ -0,0 +1,51 @@ +db->schema->getTableSchema(self::TABLE_NAME); + if ($table === null) { + return; + } + + if (!$this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('order_photo')) { + $this->addColumn( + self::TABLE_NAME, + 'order_photo', + $this->string()->null()->comment('Ссылка на фото собранного заказа для МП') + ); + } + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + if ($this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('order_photo')) { + $this->dropColumn(self::TABLE_NAME, 'order_photo'); + } + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + + } + + public function down() + { + echo "m250422_141409_add_column_order_photo_to_marketplace_orders_table cannot be reverted.\n"; + + return false; + } + */ +} diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php index c265458f..2e9a6a43 100644 --- a/erp24/records/MarketplaceOrders.php +++ b/erp24/records/MarketplaceOrders.php @@ -35,6 +35,7 @@ use Yii; * @property string|null $telegram_error ошибка телеграмма * @property string|null $status_processing_1c Статус обработки заказа в 1С * @property string|null $order_link Ссылка на заказ в МП + * @property string|null $order_photo Ссылка на фото собранного заказа для МП */ class MarketplaceOrders extends \yii\db\ActiveRecord { @@ -85,11 +86,11 @@ class MarketplaceOrders extends \yii\db\ActiveRecord [['store_id', 'warehouse_guid', 'returned_at', 'return_data', 'raw_data', 'guid'], 'default', 'value' => null], [['cancel_requested', 'status_telegram'], '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'], 'default', 'value' => null], + [['store_id', 'status_id', 'substatus_id', 'fake', 'cancel_requested', 'status_1c', 'status_processing_1c', 'order_link', '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'], 'integer'], [['creation_date', 'updated_at', 'returned_at'], 'safe'], - [['return_data', 'raw_data', 'marketplace_name', 'telegram_error', 'order_link'], 'string'], + [['return_data', 'raw_data', 'marketplace_name', 'telegram_error', 'order_link', 'order_photo'], 'string'], [['total', 'delivery_total', 'buyer_total_before_discount'], 'number'], [['marketplace_order_id'], 'string', 'max' => 64], [['number_1c'], 'string', 'max' => 100], @@ -134,6 +135,7 @@ class MarketplaceOrders extends \yii\db\ActiveRecord 'telegram_error' => 'Ошибка телеграмма', 'status_processing_1c' => 'Статус обработки заказа в 1С', 'order_link' => 'Ссылка на заказ в МП', + 'order_photo' => 'Ссылка на фото собранного заказа для МП', ]; } -- 2.39.5