Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
|
e61259ded9 | ||
|
0359315c79 | ||
|
08ff21ce04 | ||
|
de7ecd4100 |
9 changed files with 101 additions and 1189 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -49,7 +49,7 @@ jobs:
|
|||
run: composer validate
|
||||
- name: Cache Composer packages
|
||||
id: composer-cache
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: vendor
|
||||
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
|
||||
|
|
13
CHANGELOG.md
13
CHANGELOG.md
|
@ -1,3 +1,16 @@
|
|||
|
||||
## 2025-03-26 v6.6.11
|
||||
- Исправлена передача габаритов при выгрузке заказов по агенту
|
||||
|
||||
## 2025-03-25 v6.6.10
|
||||
- Исправлено некорректное изменение статуса оплаты отмененных заказов
|
||||
|
||||
## 2025-03-04 v6.6.9
|
||||
- Исправлено обновление модуля
|
||||
|
||||
## 2025-03-03 v6.6.8
|
||||
- Исправлена ошибка экспорта дополнительных свойств товаров
|
||||
|
||||
## 2025-02-04 v6.6.7
|
||||
- Исправлена ошибка установки модуля на PHP 8.0
|
||||
|
||||
|
|
|
@ -2062,7 +2062,7 @@ class RetailCrmHistory
|
|||
$payment->delete();
|
||||
}
|
||||
|
||||
if ($paymentsCrm['totalSumm'] == $paySumm) {
|
||||
if ($paymentsCrm['totalSumm'] == $paySumm && $order->getField('CANCELED') !== 'Y') {
|
||||
$order->setFieldNoDemand('PAYED', 'Y');
|
||||
} else {
|
||||
$order->setFieldNoDemand('PAYED', 'N');
|
||||
|
|
|
@ -358,7 +358,7 @@ class RetailCrmOrder
|
|||
|
||||
$order['items'][] = $item;
|
||||
|
||||
if ($send && $dimensionsSetting === 'Y') {
|
||||
if ($dimensionsSetting === 'Y') {
|
||||
$dimensions = RCrmActions::unserializeArrayRecursive($product['DIMENSIONS']);
|
||||
|
||||
if ($dimensions !== false) {
|
||||
|
@ -370,7 +370,7 @@ class RetailCrmOrder
|
|||
}
|
||||
}
|
||||
|
||||
if ($send && $dimensionsSetting === 'Y') {
|
||||
if ($dimensionsSetting === 'Y') {
|
||||
$order['width'] = $width;
|
||||
$order['height'] = $height;
|
||||
$order['length'] = $length;
|
||||
|
|
|
@ -1 +1 @@
|
|||
- Исправлена ошибка установки модуля на PHP 8.0
|
||||
- Исправлена передача габаритов при выгрузке заказов по агенту
|
|
@ -39,7 +39,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/retailcrm/exp
|
|||
}
|
||||
|
||||
global $PROFILE_ID;
|
||||
$settingService = SettingsService::getInstance([], '', $PROFILE_ID);
|
||||
$settingService = SettingsService::getInstance([], '', $PROFILE_ID ?? $profile_id);
|
||||
$iblockPropertySku = [];
|
||||
$iblockPropertySkuHl = [];
|
||||
$iblockPropertyUnitSku = [];
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
$arModuleVersion = [
|
||||
'VERSION' => '6.6.7',
|
||||
'VERSION_DATE' => '2025-02-04 18:00:00'
|
||||
'VERSION' => '6.6.11',
|
||||
'VERSION_DATE' => '2025-03-26 16:00:00'
|
||||
];
|
||||
|
|
|
@ -18,7 +18,7 @@ namespace Intaro\RetailCrm\Component;
|
|||
*/
|
||||
class Constants
|
||||
{
|
||||
public const MODULE_VERSION = '6.6.7';
|
||||
public const MODULE_VERSION = '6.6.11';
|
||||
public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
|
||||
public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
|
||||
public const CRM_USERS_MAP = 'crm_users_map';
|
||||
|
|
1259
intaro.retailcrm/updater.php
Normal file → Executable file
1259
intaro.retailcrm/updater.php
Normal file → Executable file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue