RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-01-19 17:31:43 +03:00
Code Issues Projects Releases Wiki Activity

Disallow the intersection of common fields and properties symbol codes

Browse Source
This commit is contained in:
Ilyas Salikhov 2014-11-18 18:30:43 +03:00
parent c03d1e4b65
commit bbaec03723
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intaro.intarocrm/classes/general/ICMLLoader.php
View File

@ -359,12 +359,12 @@ class ICMLLoader {
if ($propProduct != "") {
if (isset ($product["PROPERTY_" . $propProduct . "_NAME"]))
$resPropertiesProduct[$key] = $product["PROPERTY_" . $propProduct . "_NAME"];
elseif (isset ($product[$propProduct]))
$resPropertiesProduct[$key] = $product[$propProduct];
else
if (isset($product["PROPERTY_" . $propProduct . "_NAME"]))
$resPropertiesProduct[$key] = $product["PROPERTY_" . $propProduct . "_NAME"];
elseif (isset($product["PROPERTY_" . $propProduct . "_VALUE"]))
$resPropertiesProduct[$key] = $product["PROPERTY_" . $propProduct . "_VALUE"];
elseif (isset($product[$propProduct]))
$resPropertiesProduct[$key] = $product[$propProduct];
if (array_key_exists($key, $this->propertiesUnitProduct[$id])) {
$resPropertiesProduct[$key] *= $this->measurement[$this->propertiesUnitProduct[$id][$key]];
@ -412,10 +412,10 @@ class ICMLLoader {
if (isset ($offer["PROPERTY_" . $propSKU . "_NAME"]))
$offer['_PROP_' . $key] = $offer["PROPERTY_" . $propSKU . "_NAME"];
elseif (isset ($offer[$propSKU]))
$offer['_PROP_' . $key] = $offer[$propSKU];
else
elseif (isset($offer["PROPERTY_" . $propSKU . "_VALUE"]))
$offer['_PROP_' . $key] = $offer["PROPERTY_" . $propSKU . "_VALUE"];
elseif (isset($offer[$propSKU]))
$offer['_PROP_' . $key] = $offer[$propSKU];
if (array_key_exists($key, $this->propertiesUnitSKU[$id])) {
$offer['_PROP_' . $key] *= $this->measurement[$this->propertiesUnitSKU[$id][$key]];
@ -534,4 +534,4 @@ class ICMLLoader {
$offer.= "</offer>\n";
return $offer;
}
}
}