RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-25 14:56:09 +03:00
Code Issues Projects Releases Wiki Activity

Добавлена поддержка PHP 8.1-8.2

Browse Source
This commit is contained in:
Uryvskiy Dima 2023-04-17 12:50:04 +03:00 committed by GitHub
parent 0ca2527c5f
commit 198d8b2e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2023-04-10 v.6.3.3
- Исправлено некорректное отображение настроек модуля
- Добавлена поддержка PHP 8.1-8.2
## 2023-04-10 v.6.3.2 ## 2023-04-10 v.6.3.2
- Добавлена возможность экспорта неактивных товаров и торговых предложений - Добавлена возможность экспорта неактивных товаров и торговых предложений

2
README.md
View File

@ -1,7 +1,7 @@
[![Build Status](https://github.com/retailcrm/bitrix-module/workflows/ci/badge.svg)](https://github.com/retailcrm/bitrix-module/actions) [![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) [![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) [![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 Bitrix module
============= =============

3
intaro.retailcrm/description.ru
View File

@ -1 +1,2 @@
- Добавлена возможность экспорта неактивных товаров и торговых предложений - Исправлено некорректное отображение настроек модуля
- Добавлена поддержка PHP 8.1-8.2

3
intaro.retailcrm/export/export_setup.php
View File

@ -580,7 +580,8 @@ if ($STEP === 1) {
} ?> } ?>
</form> </form>
<script type="text/javascript" src='/bitrix/js/main/jquery/jquery-1.7.min.js'></script> <?php CJSCore::Init(['jquery']);?>
<script type="text/javascript"> <script type="text/javascript">
function checkLoadStatus(object) function checkLoadStatus(object)
{ {

3
intaro.retailcrm/install/step2.php
View File

@ -127,7 +127,8 @@ if (isset($arResult['PAYMENT'])) {
} }
</style> </style>
<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script> <?php CJSCore::Init(['jquery']);?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('input[name="update"]').on('click', function() { $('input[name="update"]').on('click', function() {

4
intaro.retailcrm/install/step3.php
View File

@ -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"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
const individual = $("[name='contragent-type-1']").val(); const individual = $("[name='contragent-type-1']").val();

3
intaro.retailcrm/install/step4.php
View File

@ -68,7 +68,8 @@ IncludeModuleLangFile(__FILE__);
} }
</style> </style>
<script type="text/javascript" src="/bitrix/js/main/jquery/jquery-1.7.min.js"></script> <?php CJSCore::Init(['jquery']);?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var globStop = false; var globStop = false;

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php <?php
$arModuleVersion = [ $arModuleVersion = [
'VERSION' => '6.3.2', 'VERSION' => '6.3.3',
'VERSION_DATE' => '2023-04-10 18:00:00' 'VERSION_DATE' => '2023-04-14 15:00:00'
]; ];

3
intaro.retailcrm/options.php
View File

@ -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"> <script type="text/javascript">
function createTemplates(donor) { function createTemplates(donor) {
BX.ajax.runAction('intaro:retailcrm.api.adminpanel.createTemplate', BX.ajax.runAction('intaro:retailcrm.api.adminpanel.createTemplate',