From 0f8e6a7a6a161bf500c8fb8be4e0503c12802eda Mon Sep 17 00:00:00 2001
From: RedHood <red@hood.su>
Date: Sun, 31 Jan 2021 20:39:02 +1000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D1=81=D0=BB=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=B2=D1=88=D0=B8=D1=85=20=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mirzaev/skillparts/system/models/Account.php  |  1 +
 .../system/models/AccountEdgePurchase.php     |  4 +-
 .../system/models/AccountEdgeSupply.php       |  4 +-
 mirzaev/skillparts/system/models/Document.php |  1 +
 mirzaev/skillparts/system/models/Edge.php     |  1 +
 mirzaev/skillparts/system/models/Product.php  |  5 +--
 .../system/models/ProductEdgeProduct.php      |  4 +-
 .../system/models/ProductEdgeProductGroup.php |  4 +-
 .../skillparts/system/models/ProductGroup.php | 38 ++++++++++---------
 .../models/ProductGroupEdgeProductGroup.php   |  4 +-
 mirzaev/skillparts/system/models/Purchase.php |  4 +-
 .../system/models/PurchaseEdgeSupply.php      |  4 +-
 .../skillparts/system/models/Requisite.php    | 10 +++--
 mirzaev/skillparts/system/models/Supply.php   | 27 +++++++++++--
 .../system/models/SupplyEdgeProduct.php       |  2 +
 .../system/models/SupplyEdgeRequisite.php     |  4 +-
 .../system/models/SupplyEdgeSupply.php        |  4 +-
 .../system/models/SupplyEdgeSupplyGroup.php   |  4 +-
 .../skillparts/system/models/SupplyGroup.php  |  1 +
 .../models/SupplyGroupEdgeSupplyGroup.php     |  4 +-
 20 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/mirzaev/skillparts/system/models/Account.php b/mirzaev/skillparts/system/models/Account.php
index 08f3193..9042bbd 100644
--- a/mirzaev/skillparts/system/models/Account.php
+++ b/mirzaev/skillparts/system/models/Account.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace app\models;
diff --git a/mirzaev/skillparts/system/models/AccountEdgePurchase.php b/mirzaev/skillparts/system/models/AccountEdgePurchase.php
index df61424..f2175ab 100644
--- a/mirzaev/skillparts/system/models/AccountEdgePurchase.php
+++ b/mirzaev/skillparts/system/models/AccountEdgePurchase.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class AccountEdgePurchase extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'account_edge_purchase';
     }
diff --git a/mirzaev/skillparts/system/models/AccountEdgeSupply.php b/mirzaev/skillparts/system/models/AccountEdgeSupply.php
index f7d8460..28be3f5 100644
--- a/mirzaev/skillparts/system/models/AccountEdgeSupply.php
+++ b/mirzaev/skillparts/system/models/AccountEdgeSupply.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class AccountEdgeSupply extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'account_edge_supply';
     }
diff --git a/mirzaev/skillparts/system/models/Document.php b/mirzaev/skillparts/system/models/Document.php
index 27dedd6..9e9b301 100644
--- a/mirzaev/skillparts/system/models/Document.php
+++ b/mirzaev/skillparts/system/models/Document.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace app\models;
diff --git a/mirzaev/skillparts/system/models/Edge.php b/mirzaev/skillparts/system/models/Edge.php
index 49a4b75..2e039a4 100644
--- a/mirzaev/skillparts/system/models/Edge.php
+++ b/mirzaev/skillparts/system/models/Edge.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace app\models;
diff --git a/mirzaev/skillparts/system/models/Product.php b/mirzaev/skillparts/system/models/Product.php
index a105a8f..6037555 100644
--- a/mirzaev/skillparts/system/models/Product.php
+++ b/mirzaev/skillparts/system/models/Product.php
@@ -1,12 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace app\models;
 
 use moonland\phpexcel\Excel;
 
-use mirzaev\yii2\arangodb\Query;
-
 /**
  * Продукт (в ассортименте магазина)
  *
@@ -17,7 +16,7 @@ use mirzaev\yii2\arangodb\Query;
 class Product extends Document
 {
     /**
-     * Сценарий импорта из .excel докумекнт
+     * Сценарий импорта из .excel документа
      */
     const SCENARIO_IMPORT = 'import';
 
diff --git a/mirzaev/skillparts/system/models/ProductEdgeProduct.php b/mirzaev/skillparts/system/models/ProductEdgeProduct.php
index ac01dc5..d8a94f2 100644
--- a/mirzaev/skillparts/system/models/ProductEdgeProduct.php
+++ b/mirzaev/skillparts/system/models/ProductEdgeProduct.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class ProductEdgeProduct extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'product_edge_product';
     }
diff --git a/mirzaev/skillparts/system/models/ProductEdgeProductGroup.php b/mirzaev/skillparts/system/models/ProductEdgeProductGroup.php
index 9d09d7a..09669b8 100644
--- a/mirzaev/skillparts/system/models/ProductEdgeProductGroup.php
+++ b/mirzaev/skillparts/system/models/ProductEdgeProductGroup.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class ProductEdgeProductGroup extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'product_edge_product_group';
     }
diff --git a/mirzaev/skillparts/system/models/ProductGroup.php b/mirzaev/skillparts/system/models/ProductGroup.php
index a09fe68..0f9f031 100644
--- a/mirzaev/skillparts/system/models/ProductGroup.php
+++ b/mirzaev/skillparts/system/models/ProductGroup.php
@@ -110,33 +110,35 @@ class ProductGroup extends Document implements GroupInterface
      */
     public static function createByML(Group $group): static|array|null
     {
-        if (!$model = static::readByOnecId($group->id)) {
-            // Группа не найдена
+        // if (!$model = static::readByOnecId($group->id)) {
+        //     // Группа не найдена
 
-            // Инициализация
-            $model = new static;
+        //     // Инициализация
+        //     $model = new static;
 
-            $model->onec_id = $group->id;
-        }
+        //     $model->onec_id = $group->id;
+        // }
 
-        $model->name = $group->name;
+        // $model->name = $group->name;
 
-        if ($parent = $group->getParent()) {
-            // Найден родитель
+        // if ($parent = $group->getParent()) {
+        //     // Найден родитель
 
-            // Инициализация (рекурсия)
-            $parentModel = static::createByML($parent);
+        //     // Инициализация (рекурсия)
+        //     $parentModel = static::createByML($parent);
 
-            $model->onec_prnt_id = $parentModel->id;
+        //     $model->onec_prnt_id = $parentModel->id;
 
-            unset($parentModel);
-        } else {
-            $model->onec_prnt_id = null;
-        }
+        //     unset($parentModel);
+        // } else {
+        //     $model->onec_prnt_id = null;
+        // }
 
-        $model->save();
+        // $model->save();
 
-        return $model;
+        // return $model;
+
+        return null;
     }
 
     private static function writeEdgeBetweenGroup(string $from, string $to): bool
diff --git a/mirzaev/skillparts/system/models/ProductGroupEdgeProductGroup.php b/mirzaev/skillparts/system/models/ProductGroupEdgeProductGroup.php
index 2492cf8..15c7f6b 100644
--- a/mirzaev/skillparts/system/models/ProductGroupEdgeProductGroup.php
+++ b/mirzaev/skillparts/system/models/ProductGroupEdgeProductGroup.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class ProductGroupEdgeProductGroup extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'product_group_edge_product_group';
     }
diff --git a/mirzaev/skillparts/system/models/Purchase.php b/mirzaev/skillparts/system/models/Purchase.php
index 35622be..a88584f 100644
--- a/mirzaev/skillparts/system/models/Purchase.php
+++ b/mirzaev/skillparts/system/models/Purchase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 use carono\exchange1c\interfaces\DocumentInterface;
@@ -14,7 +16,7 @@ class Purchase extends Document implements DocumentInterface
     /**
      * @return DocumentInterface[]
      */
-    public static function findDocuments1c(): ?self
+    public static function findDocuments1c(): ?array
     {
         return self::find()->andWhere(['status_id' => 2])->all();
     }
diff --git a/mirzaev/skillparts/system/models/PurchaseEdgeSupply.php b/mirzaev/skillparts/system/models/PurchaseEdgeSupply.php
index 3d19e6f..487a1c8 100644
--- a/mirzaev/skillparts/system/models/PurchaseEdgeSupply.php
+++ b/mirzaev/skillparts/system/models/PurchaseEdgeSupply.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class PurchaseEdgeSupply extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'purchase_edge_supply';
     }
diff --git a/mirzaev/skillparts/system/models/Requisite.php b/mirzaev/skillparts/system/models/Requisite.php
index e501bb9..808a94f 100644
--- a/mirzaev/skillparts/system/models/Requisite.php
+++ b/mirzaev/skillparts/system/models/Requisite.php
@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class Requisite extends Document
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'requisite';
     }
 
-    public function attributes()
+    public function attributes(): array
     {
         return array_merge(
             parent::attributes(),
@@ -17,7 +19,7 @@ class Requisite extends Document
         );
     }
 
-    public function rules()
+    public function rules(): array
     {
         return array_merge(
             parent::rules(),
@@ -31,7 +33,7 @@ class Requisite extends Document
         );
     }
 
-    public function attributeLabels()
+    public function attributeLabels(): array
     {
         return array_merge(
             parent::attributeLabels(),
diff --git a/mirzaev/skillparts/system/models/Supply.php b/mirzaev/skillparts/system/models/Supply.php
index 39ddb37..45dc220 100644
--- a/mirzaev/skillparts/system/models/Supply.php
+++ b/mirzaev/skillparts/system/models/Supply.php
@@ -104,31 +104,52 @@ class Supply extends Product implements ProductInterface
         $models = static::searchOnecByAccountId(Yii::$app->user->id, true);
         $properties = self::xml2array($properties->xml);
 
+        $fp = fopen('1.txt', 'a');
+        fwrite($fp, print_r(count($models), true) . PHP_EOL);
+        fclose($fp);
+
+        // for ($i = 0; $i <= count($models); $i++)
         foreach ($models as $model) {
             // Перебор записей
 
+            $fp = fopen('2.txt', 'a');
+            fwrite($fp, $model->ocid . PHP_EOL);
+            fclose($fp);
+
             // Инициализация
             $changes = false;
+            $transit = $model->onec;
 
-            foreach ($model->onec['ЗначенияСвойств'] as &$attribute) {
+            foreach ($model->onec['ЗначенияСвойств'] as $attribute_name => $attribute_value) {
                 // Перебор аттрибутов
 
                 foreach ($properties as $property) {
                     // Перебор свойств
 
-                    if ($attribute['ЗначенияСвойства']['Ид'] === $property['Свойство']['Ид']) {
+                    if (is_array($attribute_value) && is_array($property) && $attribute_value['Ид'] === $property['Ид']) {
                         // Совпадение идентификаторов
 
                         // Объединение данных
-                        array_merge($attribute, $property);
+                        $transit['ЗначенияСвойств'][$attribute_name] = array_merge($attribute_value, $property, $transit['ЗначенияСвойств'][$attribute_name]);
 
                         // Запись индикатора наличия изменений
                         $changes = true;
+
+                        // break;
+                    } else {
+                        // Объединение данных
+                        $transit['ЗначенияСвойств'][$attribute_name] = $property;
                     }
                 }
             }
 
             if ($changes) {
+                // Если указано, что записаны изменения
+
+                // Настройка ($transit нужен из-за ограничений __set())
+                $model->onec = $transit;
+
+                // Запись
                 $model->save();
             }
         }
diff --git a/mirzaev/skillparts/system/models/SupplyEdgeProduct.php b/mirzaev/skillparts/system/models/SupplyEdgeProduct.php
index 7f51d4d..f93801f 100644
--- a/mirzaev/skillparts/system/models/SupplyEdgeProduct.php
+++ b/mirzaev/skillparts/system/models/SupplyEdgeProduct.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 use app\models\traits\Xml2Array;
diff --git a/mirzaev/skillparts/system/models/SupplyEdgeRequisite.php b/mirzaev/skillparts/system/models/SupplyEdgeRequisite.php
index 54cdca8..6d79f4b 100644
--- a/mirzaev/skillparts/system/models/SupplyEdgeRequisite.php
+++ b/mirzaev/skillparts/system/models/SupplyEdgeRequisite.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class SupplyEdgeRequisite extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'supply_edge_requisite';
     }
diff --git a/mirzaev/skillparts/system/models/SupplyEdgeSupply.php b/mirzaev/skillparts/system/models/SupplyEdgeSupply.php
index ec08e69..8cbf446 100644
--- a/mirzaev/skillparts/system/models/SupplyEdgeSupply.php
+++ b/mirzaev/skillparts/system/models/SupplyEdgeSupply.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class SupplyEdgeSupply extends ProductEdgeProduct
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'supply_edge_supply';
     }
diff --git a/mirzaev/skillparts/system/models/SupplyEdgeSupplyGroup.php b/mirzaev/skillparts/system/models/SupplyEdgeSupplyGroup.php
index 53cf1a3..e51c1ac 100644
--- a/mirzaev/skillparts/system/models/SupplyEdgeSupplyGroup.php
+++ b/mirzaev/skillparts/system/models/SupplyEdgeSupplyGroup.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class SupplyEdgeSupplyGroup extends ProductEdgeProductGroup
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'supply_edge_supply_group';
     }
diff --git a/mirzaev/skillparts/system/models/SupplyGroup.php b/mirzaev/skillparts/system/models/SupplyGroup.php
index 0261cc5..fb56e23 100644
--- a/mirzaev/skillparts/system/models/SupplyGroup.php
+++ b/mirzaev/skillparts/system/models/SupplyGroup.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace app\models;
diff --git a/mirzaev/skillparts/system/models/SupplyGroupEdgeSupplyGroup.php b/mirzaev/skillparts/system/models/SupplyGroupEdgeSupplyGroup.php
index 181d7f1..66d198e 100644
--- a/mirzaev/skillparts/system/models/SupplyGroupEdgeSupplyGroup.php
+++ b/mirzaev/skillparts/system/models/SupplyGroupEdgeSupplyGroup.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace app\models;
 
 class SupplyGroupEdgeSupplyGroup extends Edge
 {
-    public static function collectionName()
+    public static function collectionName(): string
     {
         return 'supply_group_edge_supply_group';
     }