From 198d8b2e9ee5e9202c971bb657d9643ade8efbda Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Mon, 17 Apr 2023 12:50:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D0=B0=20PHP=208.1-8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                             | 4 ++++
 README.md                                | 2 +-
 intaro.retailcrm/description.ru          | 3 ++-
 intaro.retailcrm/export/export_setup.php | 3 ++-
 intaro.retailcrm/install/step2.php       | 3 ++-
 intaro.retailcrm/install/step3.php       | 4 +++-
 intaro.retailcrm/install/step4.php       | 3 ++-
 intaro.retailcrm/install/version.php     | 4 ++--
 intaro.retailcrm/options.php             | 3 ++-
 9 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dac417f..558ffa2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2023-04-10 v.6.3.3
+- Исправлено некорректное отображение настроек модуля 
+- Добавлена поддержка PHP 8.1-8.2
+
 ## 2023-04-10 v.6.3.2
 - Добавлена возможность экспорта неактивных товаров и торговых предложений
 
diff --git a/README.md b/README.md
index 4457e402..ca7e26fe 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://github.com/retailcrm/bitrix-module/workflows/ci/badge.svg)](https://github.com/retailcrm/bitrix-module/actions)
 [![GitHub release](https://img.shields.io/github/release/retailcrm/bitrix-module.svg?logo=github)](https://github.com/retailcrm/bitrix-module/releases)
 [![Coverage](https://img.shields.io/codecov/c/gh/retailcrm/bitrix-module/master.svg?logo=codecov)](https://codecov.io/gh/retailcrm/bitrix-module)
-[![PHP version](https://img.shields.io/badge/PHP->=5.3-blue.svg?logo=php)](https://php.net/)
+[![PHP version](https://img.shields.io/badge/PHP->=7.4-blue.svg?logo=php)](https://php.net/)
 
 Bitrix module
 =============
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index ba6f30bc..84ddeff9 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1,2 @@
-- Добавлена возможность экспорта неактивных товаров и торговых предложений
+- Исправлено некорректное отображение настроек модуля
+- Добавлена поддержка PHP 8.1-8.2
\ No newline at end of file
diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php
index cab702bc..06534af7 100644
--- a/intaro.retailcrm/export/export_setup.php
+++ b/intaro.retailcrm/export/export_setup.php
@@ -580,7 +580,8 @@ if ($STEP === 1) {
         } ?>
     </form>
 
-    <script type="text/javascript" src='/bitrix/js/main/jquery/jquery-1.7.min.js'></script>
+    <?php CJSCore::Init(['jquery']);?>
+
     <script type="text/javascript">
         function checkLoadStatus(object)
         {
diff --git a/intaro.retailcrm/install/step2.php b/intaro.retailcrm/install/step2.php
index f7af073c..8c7546a9 100644
--- a/intaro.retailcrm/install/step2.php
+++ b/intaro.retailcrm/install/step2.php
@@ -127,7 +127,8 @@ if (isset($arResult['PAYMENT'])) {
     }
 </style>
 
-<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>
+<?php CJSCore::Init(['jquery']);?>
+
 <script type="text/javascript">
     $(document).ready(function() {
         $('input[name="update"]').on('click', function() {
diff --git a/intaro.retailcrm/install/step3.php b/intaro.retailcrm/install/step3.php
index e03bd660..3effbd13 100644
--- a/intaro.retailcrm/install/step3.php
+++ b/intaro.retailcrm/install/step3.php
@@ -76,7 +76,9 @@ if (isset($arResult['ORDER_PROPS'])) {
     ];
 }
 ?>
-<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>
+
+<?php CJSCore::Init(['jquery']);?>
+
 <script type="text/javascript">
     $(document).ready(function() {
         const individual = $("[name='contragent-type-1']").val();
diff --git a/intaro.retailcrm/install/step4.php b/intaro.retailcrm/install/step4.php
index c80b5fe5..0f851bac 100644
--- a/intaro.retailcrm/install/step4.php
+++ b/intaro.retailcrm/install/step4.php
@@ -68,7 +68,8 @@ IncludeModuleLangFile(__FILE__);
     }
 </style>
 
-<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>
+<?php CJSCore::Init(['jquery']);?>
+
 <script type="text/javascript">
     $(document).ready(function() { 
         var globStop = false;
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 5be0e379..1c954c0d 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.2',
-    'VERSION_DATE' => '2023-04-10 18:00:00'
+    'VERSION'      => '6.3.3',
+    'VERSION_DATE' => '2023-04-14 15:00:00'
 ];
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index 4af988c5..7d52f64f 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -999,7 +999,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     }
     ?>
 
-    <script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script>
+    <?php CJSCore::Init(['jquery']);?>
+
     <script type="text/javascript">
         function createTemplates(donor) {
             BX.ajax.runAction('intaro:retailcrm.api.adminpanel.createTemplate',