From d31acd17d22d1b8163b09d7d7d99254d180830e0 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 19 Nov 2024 16:06:54 +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                | 6 +++---
 ...eate_products_1c_additional_characteristics_table.php | 9 ++++-----
 erp24/records/Products1cAdditionalCharacteristics.php    | 8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 3612d26b..3beb0650 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -49,8 +49,8 @@ class DataController extends BaseController {
 
     const OUT_DIR =
 //        __DIR__ . "/../json";
-       // "/www/api2/json";
-    "/var/www/erp24/api2/json";
+        "/www/api2/json";
+  //  "/var/www/erp24/api2/json";
 
 
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
@@ -602,7 +602,7 @@ class DataController extends BaseController {
                                 $additionalCharacteristic->property_id = $characteristic["id"];
                             }
 
-                            $additionalCharacteristic->value_name = $characteristic["value"];
+                            $additionalCharacteristic->value = $characteristic["value_name"];
                             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 4d029aed..2f707f28 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
@@ -15,11 +15,10 @@ class m241102_124956_create_products_1c_additional_characteristics_table extends
     public function safeUp()
     {
         $this->createTable(self::TABLE_NAME, [
-            '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' => $this->string()->notNull()->comment('Название свойства, привязанного к продукту и относящегося к данному property_id') // Property name associated with the product
-        ]);
+            'id' => $this->primaryKey()->comment('Идентификатор инкрементируемый'),
+            'product_id' => $this->string()->notNull()->comment('GUID товара'),
+            'property_id' => $this->string()->notNull()->comment('ID из product_1c_prop_type'),
+            'value' => $this->string()->notNull()->comment('Название свойства, привязанного к продукту и относящегося к данному property_id')         ]);
 
         $this->addForeignKey(
             'fk_products_1c_additional_characteristics_property_id',
diff --git a/erp24/records/Products1cAdditionalCharacteristics.php b/erp24/records/Products1cAdditionalCharacteristics.php
index eedf9ae6..f90b9a9f 100644
--- a/erp24/records/Products1cAdditionalCharacteristics.php
+++ b/erp24/records/Products1cAdditionalCharacteristics.php
@@ -10,7 +10,7 @@ use Yii;
  * @property int $id Идентификатор инкрементируемый
  * @property string $product_id GUID товара
  * @property string $property_id ID из product_1c_prop_type
- * @property string $value_name Название свойства, привязанного к продукту и относящегося к данному property_id
+ * @property string $value Название свойства, привязанного к продукту и относящегося к данному property_id
  *
  * @property Product1cPropType $property
  */
@@ -30,8 +30,8 @@ class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['product_id', 'property_id', 'value_name'], 'required'],
-            [['product_id', 'property_id', 'value_name'], 'string', 'max' => 255],
+            [['product_id', 'property_id', 'value'], 'required'],
+            [['product_id', 'property_id', 'value'], 'string', 'max' => 255],
             [['property_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product1cPropType::class, 'targetAttribute' => ['property_id' => 'id']],
         ];
     }
@@ -45,7 +45,7 @@ class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord
             'id' => 'ID',
             'product_id' => 'Product ID',
             'property_id' => 'Property ID',
-            'value_name' => 'Value Name',
+            'value' => 'Value Name',
         ];
     }
 
-- 
2.39.5