From 933e9ec12072a3e40d13c2734da52657bdd27c87 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 19 Nov 2024 13:58:30 +0300
Subject: [PATCH] =?utf8?q?=D0=97=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20?=
 =?utf8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 39 ++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 708d2d33..59465e2a 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -28,7 +28,9 @@ use yii_app\records\PaymentTypes;
 use yii_app\records\Prices;
 use yii_app\records\PricesDynamic;
 use yii_app\records\PricesZakup;
+use yii_app\records\Product1cPropType;
 use yii_app\records\Products1c;
+use yii_app\records\Products1cAdditionalCharacteristics;
 use yii_app\records\Sales;
 use yii_app\records\SalesItems;
 use yii_app\records\SalesProducts;
@@ -48,7 +50,9 @@ class DataController extends BaseController {
     const OUT_DIR =
 //        __DIR__ . "/../json";
        // "/www/api2/json";
-    "/var/www/erp24/api2/json";
+    //"/var/www/erp24/api2/json";
+    "/www/api2/json";
+
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
 
     public function actionRequest() {
@@ -571,6 +575,39 @@ class DataController extends BaseController {
                     if ($products1c6->getErrors()) {
                         LogService::apiErrorLog(json_encode(["error_id" => 8, "error" => $products1c6->getErrors()], JSON_UNESCAPED_UNICODE));
                     }
+
+                    if (!empty($arr["AdditionCharacteristics"])) {
+                        foreach ($arr["AdditionCharacteristics"] as $characteristic) {
+
+                            $propertyType = Product1cPropType::findOne(['id' => $characteristic["id"]]);
+                            if (!$propertyType) {
+                                $propertyType = new Product1cPropType();
+                                $propertyType->id = $characteristic["id"];
+                                $propertyType->name = $characteristic["name"];
+                                if (!$propertyType->save()) {
+                                    LogService::apiErrorLog(json_encode(["error_id" => 8.1, "error" => $propertyType->getErrors()], JSON_UNESCAPED_UNICODE));
+                                    continue;
+                                }
+                            }
+
+
+                            $additionalCharacteristic = Products1cAdditionalCharacteristics::findOne([
+                                'product_id' => $arr["id"],
+                                'property_id' => $characteristic["id"]
+                            ]);
+
+                            if (!$additionalCharacteristic) {
+                                $additionalCharacteristic = new Products1cAdditionalCharacteristics();
+                                $additionalCharacteristic->product_id = $arr["id"];
+                                $additionalCharacteristic->property_id = $characteristic["id"];
+                            }
+
+                            $additionalCharacteristic->value_name = $characteristic["value_name"];
+                            if (!$additionalCharacteristic->save()) {
+                                LogService::apiErrorLog(json_encode(["error_id" => 8.2, "error" => $additionalCharacteristic->getErrors()], JSON_UNESCAPED_UNICODE));
+                            }
+                        }
+                    }
                 }
             }
 
-- 
2.39.5