From fea58757489099893381f0b79af03634b2b490d9 Mon Sep 17 00:00:00 2001
From: "a.belikin" <andr.belousow2017@yandex.ru>
Date: Tue, 12 Nov 2024 19:27:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=81?=
 =?UTF-8?q?=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=D0=B2.=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2,=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BA=D0=BE=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 intaro.retailcrm/export/export_setup.php      | 53 +++++++++----------
 intaro.retailcrm/lib/icml/settingsservice.php | 11 +++-
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php
index adc7f3f1..f8c9d5fc 100644
--- a/intaro.retailcrm/export/export_setup.php
+++ b/intaro.retailcrm/export/export_setup.php
@@ -190,8 +190,7 @@ if ($STEP === 1) {
                             <tbody>
 
                             <?php
-                            foreach ($settingsService->defaultPropList as $propertyKey => $property) {
-                                $productSelected = false; ?>
+                            foreach ($settingsService->defaultPropList as $propertyKey => $property) { ?>
 
                                 <tr class="adm-list-table-row">
                                     <td class="adm-list-table-cell">
@@ -215,14 +214,14 @@ if ($STEP === 1) {
                                                     if ($keyField === $propertyKey) { ?>
                                                         <option value="<?=$field['CODE']?>"
                                                             <?php
-                                                            $productSelected = $settingsService->isOptionSelected(
+                                                            $isSelected = $settingsService->isOptionSelected(
                                                                 $field,
                                                                 $arIBlock['OLD_PROPERTY_PRODUCT_SELECT'],
                                                                 $propertyKey
                                                             );
                                                             ?>
 
-                                                            <?= $productSelected ? ' selected' : ''?>
+                                                            <?= $isSelected ? ' selected' : ''?>
                                                         >
                                                             <?=$field['name']?>
                                                         </option>
@@ -241,7 +240,7 @@ if ($STEP === 1) {
                                                         <?php
                                                         echo $settingsService->getOptionClass($prop, true);
 
-                                                        $productSelected = $settingsService->isOptionSelected(
+                                                        $isSelected = $settingsService->isOptionSelected(
                                                             $prop,
                                                             $arIBlock['OLD_PROPERTY_PRODUCT_SELECT'],
                                                             $propertyKey
@@ -251,7 +250,7 @@ if ($STEP === 1) {
                                                             = $settingsService->getHlTableName($prop)
                                                             ?? $productHlTableName;
 
-                                                        echo $productSelected ? ' selected' : '';
+                                                        echo $isSelected ? ' selected' : '';
                                                         ?>
                                                     >
                                                         <?=$prop['NAME']?>
@@ -376,19 +375,18 @@ if ($STEP === 1) {
                                                         <option value="<?=$prop['CODE']?>"
                                                             <?php
                                                             echo $settingsService->getOptionClass($prop, false);
-                                                            if (!$productSelected) {
-                                                                $isSelected = $settingsService->isOptionSelected(
-                                                                    $prop,
-                                                                    $arIBlock['OLD_PROPERTY_SKU_SELECT'],
-                                                                    $propertyKey
-                                                                );
 
-                                                                $skuHlTableName
-                                                                    = $settingsService->getHlTableName($prop)
-                                                                    ?? $skuHlTableName;
+                                                            $isSelected = $settingsService->isOptionSelected(
+                                                                $prop,
+                                                                $arIBlock['OLD_PROPERTY_SKU_SELECT'],
+                                                                $propertyKey
+                                                            );
 
-                                                                echo $isSelected ? ' selected' : '';
-                                                            }
+                                                            $skuHlTableName
+                                                                = $settingsService->getHlTableName($prop)
+                                                                ?? $skuHlTableName;
+
+                                                            echo $isSelected ? ' selected' : '';
                                                             ?>
                                                         >
                                                             <?=$prop['NAME']?>
@@ -475,7 +473,6 @@ if ($STEP === 1) {
                             } ?>
 
                             <?php
-                                $productSelected = false;
                                 $catalogId = $arIBlock['ID'];
                                 $catalogCustomProps = $settingsService->customPropList[$catalogId];
 
@@ -500,7 +497,7 @@ if ($STEP === 1) {
                                                     <?php
                                                     echo $settingsService->getOptionClass($prop, true);
 
-                                                    $productSelected = $settingsService->isOptionSelected(
+                                                    $isSelected = $settingsService->isOptionSelected(
                                                         $prop,
                                                         $arIBlock['OLD_PROPERTY_PRODUCT_SELECT'],
                                                         $catalogCustomPropCode
@@ -510,7 +507,7 @@ if ($STEP === 1) {
                                                         = $settingsService->getHlTableName($prop)
                                                         ?? $productHlTableName;
 
-                                                    echo $productSelected ? ' selected' : '';
+                                                    echo $isSelected ? ' selected' : '';
                                                     ?>
                                                 >
                                                     <?=$prop['NAME']?>
@@ -519,12 +516,11 @@ if ($STEP === 1) {
                                             </select>
                                         </td>
 
-                                        <?php if ($arIBlock['PROPERTIES_SKU'] !== null) {
-                                            $productSelected = false; ?>
+                                        <?php if ($arIBlock['PROPERTIES_SKU'] !== null) { ?>
                                             <td class="adm-list-table-cell">
                                                 <select
-                                                    name="iblockPropertyProduct_<?=$catalogCustomPropCode?>[<?= $catalogId ?>]"
-                                                    id="iblockPropertyProduct_<?=$catalogCustomPropCode . $catalogId ?>"
+                                                    name="iblockPropertySku_<?=$catalogCustomPropCode?>[<?= $catalogId ?>]"
+                                                    id="iblockPropertySku_<?=$catalogCustomPropCode . $catalogId ?>"
                                                     class="property-export"
                                                     data-type="<?= $catalogCustomPropCode ?>"
                                                     onchange="propertyChange(this)"
@@ -535,9 +531,8 @@ if ($STEP === 1) {
                                                             $skuHlTableName = ''; ?>
                                                             <option value="<?=$prop['CODE']?>"
                                                                 <?php
-                                                                echo $settingsService->getOptionClass($prop, false);
+                                                                    echo $settingsService->getOptionClass($prop, false);
 
-                                                                if (!$productSelected) {
                                                                     $isSelected = $settingsService->isOptionSelected(
                                                                         $prop,
                                                                         $arIBlock['OLD_PROPERTY_SKU_SELECT'],
@@ -549,7 +544,6 @@ if ($STEP === 1) {
                                                                         ?? $skuHlTableName;
 
                                                                     echo $isSelected ? ' selected' : '';
-                                                                }
                                                                 ?>
                                                             >
                                                                 <?=$prop['NAME']?>
@@ -766,6 +760,7 @@ if ($STEP === 1) {
 
         function propertyChange(obj) {
             let selectedOption = $(obj).find('option')[obj.selectedIndex];
+            console.log(selectedOption);
 
             if (selectedOption.className === 'not-highloadblock') {
                 let objId = '#' + obj.id;
@@ -932,7 +927,7 @@ if ($STEP === 1) {
                         properties: customProps,
                         profileId: profileId
                     },
-                }).then(addParamsToSetupFieldsList);
+                }).then(addParamsToSetupFieldsList());
             }
 
             if (Object.keys(customPropsToDelete).length > 0) {
@@ -941,7 +936,7 @@ if ($STEP === 1) {
                         properties: customPropsToDelete,
                         profileId: profileId
                     },
-                }).then(deleteParamsFromSetupFieldsList);
+                }).then(deleteParamsFromSetupFieldsList());
             }
 
             const promises = [savePromise, deletePromise].filter(Boolean);
diff --git a/intaro.retailcrm/lib/icml/settingsservice.php b/intaro.retailcrm/lib/icml/settingsservice.php
index 88ab9614..85b90088 100644
--- a/intaro.retailcrm/lib/icml/settingsservice.php
+++ b/intaro.retailcrm/lib/icml/settingsservice.php
@@ -541,6 +541,9 @@ class SettingsService
      */
     public function isOptionSelected(array $prop, array $oldSelect, string $key): bool
     {
+        if ($key === 'manufacturer') {
+            $a = 'yes';
+        }
         if (count($oldSelect) > 0) {
             if ($prop['CODE'] === $oldSelect[$key]) {
                 return true;
@@ -635,7 +638,9 @@ class SettingsService
             $dbSkuProperties = CIBlock::GetProperties($iblockOffer['IBLOCK_ID'], [], ['MULTIPLE' => 'N']);
 
             while ($prop = $dbSkuProperties->Fetch()) {
-                $propertiesSKU[] = $prop;
+                if ($prop['CODE'] !== '') {
+                    $propertiesSKU[] = $prop;
+                }
             }
         }
 
@@ -689,7 +694,9 @@ class SettingsService
         $iblockResult = CIBlock::GetProperties($iblockId, [], ['MULTIPLE' => 'N']);
 
         while ($prop = $iblockResult->Fetch()) {
-            $propertiesProduct[] = $prop;
+            if ($prop['CODE'] !== '') {
+                $propertiesProduct[] = $prop;
+            }
         }
 
         return $propertiesProduct;