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 #2 from VitalyArt/master

Browse Source 
bugfix address
This commit is contained in:
Alex Lushpai 2016-12-13 12:02:56 +03:00 committed by GitHub
commit d5456617b1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/modules/RetailCRM/classes/retailcrm/RCrmActions.php
View File

@ -131,15 +131,23 @@ class RCrmActions
$deliveryNotes = $deliveryObj->getValue('order_comments');
if ($deliveryObj->getValue('region') !== null) {
$deliveryRegionObj = new umiObject($deliveryObj->getValue('region'));
$deliveryRegion = $deliveryRegionObj->getName();
try {
$deliveryRegionObj = new umiObject($deliveryObj->getValue('region'));
$deliveryRegion = $deliveryRegionObj->getName();
} catch (Exception $e) {
$deliveryRegion = $deliveryObj->getValue('region');
}
} else {
$deliveryRegion = '';
}
if ($deliveryObj->getValue('city') !== null) {
$deliveryCityObj = new umiObject($deliveryObj->getValue('city'));
$deliveryCity = $deliveryCityObj->getName();
try {
$deliveryCityObj = new umiObject($deliveryObj->getValue('city'));
$deliveryCity = $deliveryCityObj->getName();
} catch (Exception $e) {
$deliveryCity = $deliveryObj->getValue('city');
}
} else {
$deliveryCity = '';
}
@ -262,4 +270,4 @@ class RCrmActions
return $orderToCrm;
}
}
}