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

Merge pull request #79 from sergeygw1990/master

Browse Source 
Исправление генерации единиц измерения
This commit is contained in:
Alex Lushpai 2019-08-29 13:58:45 +03:00 committed by GitHub
commit 88ad72354e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2019-08-28 v.2.5.1
* Исправление генерации единиц измерения
## 2019-07-26 v.2.5.0 ## 2019-07-26 v.2.5.0
* Исправление создание дублей заказов * Исправление создание дублей заказов

8
intaro.retailcrm/classes/general/icml/RetailCrmICML.php
View File

@ -657,8 +657,16 @@ class RetailCrmICML
} else { } else {
$offer .= '<unit code="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_INTL']) . '" name="' . $this->PrepareValue($arOffer["MEASURE"]['MEASURE_TITLE']) . '" sym="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_RUS']) . '" />' . "\n"; $offer .= '<unit code="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_INTL']) . '" name="' . $this->PrepareValue($arOffer["MEASURE"]['MEASURE_TITLE']) . '" sym="' . $this->PrepareValue($arOffer["MEASURE"]['SYMBOL_RUS']) . '" />' . "\n";
} }
} else {
$measure = \Bitrix\Catalog\ProductTable::getCurrentRatioWithMeasure($arOffer["ID"]);
if ($this->measure[$measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL']]) {
$offer .= '<unit code="' . $this->measure[$this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL'])] . '" />' . "\n";
} else {
$offer .= '<unit code="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_INTL']) . '" name="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['MEASURE_TITLE']) . '" sym="' . $this->PrepareValue($measure[$arOffer["ID"]]["MEASURE"]['SYMBOL_RUS']) . '" />' . "\n";
}
} }
if ($arOffer["BARCODE"]) { if ($arOffer["BARCODE"]) {
$offer.= "<barcode>" . $this->PrepareValue($arOffer["BARCODE"]) . "</barcode>\n"; $offer.= "<barcode>" . $this->PrepareValue($arOffer["BARCODE"]) . "</barcode>\n";
} }

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Исправление создание дублей заказов - Исправление генерации единиц измерения

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

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "2.5.0", "VERSION" => "2.5.1",
"VERSION_DATE" => "2019-07-26 17:40:00" "VERSION_DATE" => "2019-08-28 15:20:00"
); );