]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Поправил название класса
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 27 Nov 2024 14:37:20 +0000 (17:37 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 27 Nov 2024 14:37:20 +0000 (17:37 +0300)
erp24/api2/controllers/DataController.php
erp24/controllers/ProductsController.php
erp24/records/Products1cAdditionalCharacteristics.php
erp24/records/Products1cPropType.php

index 8bb0d9e9f948523836f14ba2ba03355c29d3125b..338c76beb5042e3fd50516eefc3b9a88f30ba33b 100644 (file)
@@ -28,7 +28,7 @@ use yii_app\records\PaymentTypes;
 use yii_app\records\Prices;
 use yii_app\records\PricesDynamic;
 use yii_app\records\PricesZakup;
-use yii_app\records\Products1CPropType;
+use yii_app\records\Products1cPropType;
 use yii_app\records\Products1c;
 use yii_app\records\Products1cAdditionalCharacteristics;
 use yii_app\records\Sales;
@@ -605,9 +605,9 @@ class DataController extends BaseController {
 
                             foreach ($arr["AdditionCharacteristics"] as $characteristic) {
 
-                            $propertyType = Products1CPropType::findOne(['id' => $characteristic["id"]]);
+                            $propertyType = Products1cPropType::findOne(['id' => $characteristic["id"]]);
                             if (!$propertyType) {
-                                $propertyType = new Products1CPropType();
+                                $propertyType = new Products1cPropType();
                                 $propertyType->id = $characteristic["id"];
                                 $propertyType->name = $characteristic["name"];
                                 if (!$propertyType->save()) {
index 31c5c3e0d060e897fe73fbc7f88a27f239aaa9db..4d0743bd22bc4479649e524340a4496683ae37fc 100755 (executable)
@@ -8,7 +8,7 @@ use yii\helpers\Html;
 use yii\web\Controller;
 use yii_app\records\ExportImportTable;
 use yii_app\records\Prices;
-use yii_app\records\Products1CPropType;
+use yii_app\records\Products1cPropType;
 use yii_app\records\Products1c;
 use yii_app\records\Products1cAdditionalCharacteristics;
 use yii_app\records\Products1cOptions;
@@ -219,7 +219,7 @@ class ProductsController extends Controller
             }
 
 
-            $properties = Products1CPropType::find()
+            $properties = Products1cPropType::find()
                 ->select(['id', 'name'])
                 ->all();
             $properties = ArrayHelper::map($properties, 'id', 'name');
index 0cd8219f2dcf4586f5c195a58b083630c221a06a..335559014476a3a1c5de146b84bd8d4cc6c29d85 100644 (file)
@@ -12,7 +12,7 @@ use Yii;
  * @property string $property_id ID из product_1c_prop_type
  * @property string $value Название свойства, привязанного к продукту и относящегося к данному property_id
  *
- * @property Products1CPropType $property
+ * @property Products1cPropType $property
  */
 class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord
 {
@@ -39,7 +39,7 @@ class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord
         return [
             [['product_id', 'property_id', 'value'], 'required'],
             [['product_id', 'property_id', 'value'], 'string', 'max' => 255],
-            [['property_id'], 'exist', 'skipOnError' => true, 'targetClass' => Products1CPropType::class, 'targetAttribute' => ['property_id' => 'id']],
+            [['property_id'], 'exist', 'skipOnError' => true, 'targetClass' => Products1cPropType::class, 'targetAttribute' => ['property_id' => 'id']],
         ];
     }
 
@@ -63,6 +63,6 @@ class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord
      */
     public function getProperty()
     {
-        return $this->hasOne(Products1CPropType::class, ['id' => 'property_id']);
+        return $this->hasOne(Products1cPropType::class, ['id' => 'property_id']);
     }
 }
index 3f534c4bbfdf52465ce68dfca1ebb5c9ae3abd59..b747943ed8364c4b470d4f07508f2988b9791b48 100644 (file)
@@ -12,7 +12,7 @@ use Yii;
  *
  * @property Products1cAdditionalCharacteristics[] $products1cAdditionalCharacteristics
  */
-class Products1CPropType extends \yii\db\ActiveRecord
+class Products1cPropType extends \yii\db\ActiveRecord
 {
     /**
      * {@inheritdoc}