From 51ac68ae964b8912a56ba25a828d9d1ff4ea1613 Mon Sep 17 00:00:00 2001 From: fomichev Date: Tue, 19 Nov 2024 15:52:27 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?= =?utf8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D0=BE=D0=BB=D0=B5=20value=5Fna?= =?utf8?q?me=20=D0=B2=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 2 +- ...4956_create_products_1c_additional_characteristics_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 2e2e7bb1..3612d26b 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -602,7 +602,7 @@ class DataController extends BaseController { $additionalCharacteristic->property_id = $characteristic["id"]; } - $additionalCharacteristic->value_name = $characteristic["value_name"]; + $additionalCharacteristic->value_name = $characteristic["value"]; if (!$additionalCharacteristic->save()) { LogService::apiErrorLog(json_encode(["error_id" => 8.2, "error" => $additionalCharacteristic->getErrors()], JSON_UNESCAPED_UNICODE)); } diff --git a/erp24/migrations/m241102_124956_create_products_1c_additional_characteristics_table.php b/erp24/migrations/m241102_124956_create_products_1c_additional_characteristics_table.php index 6fbc2b5f..4d029aed 100644 --- a/erp24/migrations/m241102_124956_create_products_1c_additional_characteristics_table.php +++ b/erp24/migrations/m241102_124956_create_products_1c_additional_characteristics_table.php @@ -18,7 +18,7 @@ class m241102_124956_create_products_1c_additional_characteristics_table extends 'id' => $this->primaryKey()->comment('Идентификатор инкрементируемый'), // Auto-incrementing primary key 'product_id' => $this->string()->notNull()->comment('GUID товара'), // GUID of the product 'property_id' => $this->string()->notNull()->comment('ID из product_1c_prop_type'), // Foreign key to property type - 'value_name' => $this->string()->notNull()->comment('Название свойства, привязанного к продукту и относящегося к данному property_id') // Property name associated with the product + 'value' => $this->string()->notNull()->comment('Название свойства, привязанного к продукту и относящегося к данному property_id') // Property name associated with the product ]); $this->addForeignKey( -- 2.39.5