RetailCRM-Mirror/umi-module
1
0
Fork 0
mirror of synced 2024-12-04 19:06:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from VitalyArt/master

Browse Source 
module update
This commit is contained in:
Alex Lushpai 2016-12-14 12:32:01 +03:00 committed by GitHub
commit f7ed84d781
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classes/modules/RetailCRM/classes/retailcrm/RCrmIcml.php
View File

@ -18,8 +18,14 @@ class RCrmIcml
$domainsCollection = domainsCollection::getInstance();
$domainsCollectionList = $domainsCollection->getList();
$domainCollection = $domainsCollectionList[1];
$serverProtocol = mainConfiguration::getInstance()->get('system', 'server-protocol') . '://';
$this->shopUrl = $serverProtocol . $domainCollection->getHost();
if (mainConfiguration::getInstance()->get('system', 'server-protocol')) {
$serverProtocol = mainConfiguration::getInstance()->get('system', 'server-protocol');
} else {
$serverProtocol = 'http';
}
$this->shopUrl = $serverProtocol . '://' . $domainCollection->getHost();
}
public function generateICML()
@ -92,12 +98,15 @@ class RCrmIcml
{
$url = '/' . $obj->getAltName();
$ids = array($obj->getRel());
$parent = new umiHierarchyElement($obj->getRel());
while (true) {
$url = '/' . $parent->getAltName() . $url;
if ($parent->getRel() != 0) {
if ($parent->getRel() != 0 && !in_array($parent->getRel(), $ids)) {
$parent = new umiHierarchyElement($parent->getRel());
array_push($ids, $parent->getRel());
} else {
break;
}
@ -306,4 +315,4 @@ class RCrmIcml
}
}
}
}
}